heimdal_build: Don't use heimdal's getprogname() and setprogname()

Writing into an __progname variable spooks me, and if we use the local
variable, then we duplciate the system one, which fails SYMBOLCHECK

Andrew Bartlett

diff --git a/source4/heimdal_build/replace.c b/source4/heimdal_build/replace.c
index 51393f6e6878d51c4b4f61314acac4dd1da86787..e6a74f9ba8d565b038dc2094651c4108a659c84e 100644 (file)
--- a/source4/heimdal_build/replace.c
+++ b/source4/heimdal_build/replace.c
@@ -83,3 +83,20 @@
        return -1;
 }
 #endif
+
+#ifndef HAVE_SETPROGNAME
+
+/* We don't want to use a setprogname reimplementation */
+void setprogname(const char *argv0)
+{
+}
+
+#endif /* HAVE_SETPROGNAME */
+
+#ifndef HAVE_GETPROGNAME
+/* We don't want to use a getprogname reimplementation */
+const char *getprogname(void)
+{
+       return "";
+}
+#endif /* HAVE_GETPROGNAME */

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index b52acd6661ea404bff5f9938e31bcb50550a4550..705caa52e2d600821a05b6bc3eb430f53dc85746 100644 (file)
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -400,12 +400,6 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
         ../heimdal_build/replace.c
     '''
 
-    if not bld.CONFIG_SET('HAVE_GETPROGNAME'):
-        ROKEN_HOSTCC_SOURCE += '''
-            lib/roken/getprogname.c
-            lib/roken/setprogname.c
-        '''
-
     if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
         ROKEN_HOSTCC_SOURCE += '''
             lib/roken/closefrom.c