X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Ftstpass.c;h=e15146dd8593d95522bf28788195631155bf4ccf;hp=a2e155bff1e13aac948fedaa56ceed4612281bb4;hb=c97718edd01f7d1813edbf94c58b93a747143311;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197

diff --git a/util/tstpass.c b/util/tstpass.c
index a2e155b..e15146d 100644
--- a/util/tstpass.c
+++ b/util/tstpass.c
@@ -1,8 +1,5 @@
-/* $Id: tstpass.c,v 1.2 2007-01-15 15:10:26 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -20,11 +17,27 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <passwddb.h>
 #include <yaz/test.h>
+#include <yaz/snprintf.h>
+#include <stdlib.h>
+
+/* use env srcdir as base directory - or current directory if unset */
+const char *get_srcdir(void)
+{
+    const char *srcdir = getenv("srcdir");
+    if (!srcdir || ! *srcdir)
+        srcdir=".";
+    return srcdir;
+
+}
 
 static void tst(void)
 {
+    char path[1024];
     Passwd_db db;
     
     db = passwd_db_open();
@@ -32,10 +45,12 @@ static void tst(void)
     if (!db)
         return;
 
-    YAZ_CHECK_EQ(passwd_db_file_plain(db, "no_such_file.txt"), -1);
-    YAZ_CHECK_EQ(passwd_db_file_crypt(db, "no_such_file.txt"), -1);
+    yaz_snprintf(path, sizeof(path), "%s/no_such_file.txt", get_srcdir());
+    YAZ_CHECK_EQ(passwd_db_file_plain(db, path), -1);
+    YAZ_CHECK_EQ(passwd_db_file_crypt(db, path), -1);
+    yaz_snprintf(path, sizeof(path), "%s/tstpass.txt", get_srcdir());
 #if HAVE_CRYPT_H
-    YAZ_CHECK_EQ(passwd_db_file_crypt(db, "tstpass.txt"), 0);
+    YAZ_CHECK_EQ(passwd_db_file_crypt(db, path), 0);
     YAZ_CHECK_EQ(passwd_db_auth(db, "other", "x1234"), -1);
     YAZ_CHECK_EQ(passwd_db_auth(db, "admin", "abcd"), -2);
     YAZ_CHECK_EQ(passwd_db_auth(db, "admin", "fruitbat"), 0);
@@ -50,12 +65,14 @@ static void tst(void)
 int main (int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
+    YAZ_CHECK_LOG();
     tst();
     YAZ_CHECK_TERM;
 }
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab