Merge branch 'upstream'

[debian/amanda] / server-src / getconf.c

diff --git a/server-src/getconf.c b/server-src/getconf.c
index fb90b37afb0150863f3dc9a7a0b3288c53fa3b78..27d02dd660800c97887df948d54a2354c75920aa 100644 (file)
--- a/server-src/getconf.c
+++ b/server-src/getconf.c
@@ -224,6 +224,13 @@ static struct build_info {
        "1"
 #else
        NULL
+#endif
+    },
+    { "AIX_TAPEIO",
+#if defined(AIX_TAPEIO)
+       "1"
+#else
+       NULL
 #endif
     },
     { "DUMP_RETURNS_1",
@@ -274,6 +281,13 @@ static struct build_info {
        "1"
 #else
        NULL
+#endif
+    },
+    { "DEBUG_CODE",
+#if defined(DEBUG_CODE)
+       "1"
+#else
+       NULL
 #endif
     },
     { "BSD_SECURITY",
@@ -444,8 +458,8 @@ main(
 
     cfg_ovr = extract_commandline_config_overwrites(&argc, &argv);
 
-    if((pgm = strrchr(argv[0], '/')) == NULL) {
-       pgm = argv[0];
+    if((pgm = strrchr(my_argv[0], '/')) == NULL) {
+       pgm = my_argv[0];
     } else {
        pgm++;
     }