Merge branch-2-1

[netatalk.git] / bin / misc / uuidtest.c

diff --git a/bin/misc/uuidtest.c b/bin/misc/uuidtest.c
index 524e25b7a138b8d9e4fc6a3775efa0a15581d897..cb9177edd7e26e8c758076447307ba2987c050e9 100644 (file)
--- a/bin/misc/uuidtest.c
+++ b/bin/misc/uuidtest.c
@@ -69,23 +69,25 @@ int main( int argc, char **argv)
     int ret, i, c;
     int verbose = 0;
     atalk_uuid_t uuid;
+    int logsetup = 0;
     uuidtype_t type;
     char *uuidstring = NULL;
     char *name = NULL;
 
-    setuplog("console log_error /dev/tty");
-
     while ((c = getopt(argc, argv, ":vu:g:i:")) != -1) {
         switch(c) {
 
         case 'v':
             if (! verbose) {
                 verbose = 1;
-                setuplog("console log_debug /dev/tty");
+                setuplog("default log_maxdebug /dev/tty");
+                logsetup = 1;
             }
             break;
 
         case 'u':
+            if (! logsetup)
+                setuplog("default log_info /dev/tty");
             parse_ldapconf();
             printf("Searching user: %s\n", optarg);
             ret = getuuidfromname( optarg, UUID_USER, uuid);
@@ -99,6 +101,8 @@ int main( int argc, char **argv)
             break;
 
         case 'g':
+            if (! logsetup)
+                setuplog("default log_info /dev/tty");
             parse_ldapconf();
             printf("Searching group: %s\n", optarg);
             ret = getuuidfromname( optarg, UUID_GROUP, uuid);
@@ -112,6 +116,8 @@ int main( int argc, char **argv)
             break;
 
         case 'i':
+            if (! logsetup)
+                setuplog("default log_info /dev/tty");
             parse_ldapconf();
             printf("Searching uuid: %s\n", optarg);
             uuid_string2bin(optarg, uuid);