Remove all uses of setprogname() and getprogname() in kerberosV subtree.

46 files changed, 21 insertions, 79 deletions

diff --git a/kerberosV/src/admin/ktutil.c b/kerberosV/src/admin/ktutil.c
index 64249db1f86..9078b2beb16 100644
--- a/kerberosV/src/admin/ktutil.c
+++ b/kerberosV/src/admin/ktutil.c
@@ -154,7 +154,7 @@ main(int argc, char **argv)
 {
     int optind = 0;
     krb5_error_code ret;
-    setprogname(argv[0]);
+
     ret = krb5_init_context(&context);
     if (ret)
 	errx (1, "krb5_init_context failed: %d", ret);
diff --git a/kerberosV/src/appl/afsutil/afslog.c b/kerberosV/src/appl/afsutil/afslog.c
index 216258b068a..cd2f95742fc 100644
--- a/kerberosV/src/appl/afsutil/afslog.c
+++ b/kerberosV/src/appl/afsutil/afslog.c
@@ -179,8 +179,6 @@ main(int argc, char **argv)
     int num;
     int ret = 0;
     
-    setprogname(argv[0]);
-
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
     if(help_flag)
diff --git a/kerberosV/src/appl/ftp/ftp/main.c b/kerberosV/src/appl/ftp/ftp/main.c
index e48ec9b29de..968a9779274 100644
--- a/kerberosV/src/appl/ftp/ftp/main.c
+++ b/kerberosV/src/appl/ftp/ftp/main.c
@@ -46,8 +46,6 @@ main(int argc, char **argv)
 	char homedir[MaxPathLen];
 	struct servent *sp;
 
-	setprogname(argv[0]);
-
 	sp = getservbyname("ftp", "tcp");
 	if (sp == 0)
 		errx(1, "ftp/tcp: unknown service");
@@ -127,7 +125,7 @@ main(int argc, char **argv)
 		exit(0);
 	    signal(SIGINT, intr);
 	    signal(SIGPIPE, lostpeer);
-	    xargv[0] = (char*)getprogname();
+	    xargv[0] = __progname;
 	    xargv[1] = argv[0];
 	    xargv[2] = argv[1];
 	    xargv[3] = argv[2];
diff --git a/kerberosV/src/appl/ftp/ftpd/ftpd.c b/kerberosV/src/appl/ftp/ftpd/ftpd.c
index 7f64290da80..a8537265ae5 100644
--- a/kerberosV/src/appl/ftp/ftpd/ftpd.c
+++ b/kerberosV/src/appl/ftp/ftpd/ftpd.c
@@ -264,8 +264,6 @@ main(int argc, char **argv)
 
     int optind = 0;
 
-    setprogname (argv[0]);
-
     /* detach from any tickets and tokens */
     {
 #ifdef KRB4
diff --git a/kerberosV/src/appl/kf/kf.c b/kerberosV/src/appl/kf/kf.c
index 91864a05de1..660b7537543 100644
--- a/kerberosV/src/appl/kf/kf.c
+++ b/kerberosV/src/appl/kf/kf.c
@@ -71,8 +71,6 @@ client_setup(krb5_context *context, int *argc, char **argv)
     int port = 0;
     int status;
 
-    setprogname (argv[0]);
- 
     status = krb5_init_context (context);
     if (status)
 	errx(1, "krb5_init_context failed: %d", status);
diff --git a/kerberosV/src/appl/kf/kfd.c b/kerberosV/src/appl/kf/kfd.c
index d173b3dd58f..d644c2566a7 100644
--- a/kerberosV/src/appl/kf/kfd.c
+++ b/kerberosV/src/appl/kf/kfd.c
@@ -315,7 +315,6 @@ main(int argc, char **argv)
     int port;
     int ret;
 
-    setprogname (argv[0]);
     roken_openlog (argv[0], LOG_ODELAY | LOG_PID,LOG_AUTH);
     port = server_setup(&context, argc, argv);
     ret = doit (port, service);
diff --git a/kerberosV/src/appl/kx/kx.c b/kerberosV/src/appl/kx/kx.c
index b0d954b44d6..e066fa23a30 100644
--- a/kerberosV/src/appl/kx/kx.c
+++ b/kerberosV/src/appl/kx/kx.c
@@ -692,8 +692,6 @@ main(int argc, char **argv)
     int ret	= 1;
     char *host	= NULL;
 
-    setprogname (argv[0]);
-
     if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
 		&optind))
 	usage (1);
diff --git a/kerberosV/src/appl/kx/kxd.c b/kerberosV/src/appl/kx/kxd.c
index 7d84e299199..e16e031bf2d 100644
--- a/kerberosV/src/appl/kx/kxd.c
+++ b/kerberosV/src/appl/kx/kxd.c
@@ -710,7 +710,6 @@ main (int argc, char **argv)
     int port;
     int optind = 0;
 
-    setprogname (argv[0]);
     roken_openlog ("kxd", LOG_ODELAY | LOG_PID, LOG_DAEMON);
 
     if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
diff --git a/kerberosV/src/appl/login/login.c b/kerberosV/src/appl/login/login.c
index 6ffe23e9d5b..812ebff2fd4 100644
--- a/kerberosV/src/appl/login/login.c
+++ b/kerberosV/src/appl/login/login.c
@@ -669,8 +669,6 @@ main(int argc, char **argv)
     int ask = 1;
     struct sigaction sa;
     
-    setprogname(argv[0]);
-
 #ifdef KRB5
     {
 	krb5_error_code ret;
diff --git a/kerberosV/src/appl/login/osfc2.c b/kerberosV/src/appl/login/osfc2.c
index 0099ad1722c..099e35586ad 100644
--- a/kerberosV/src/appl/login/osfc2.c
+++ b/kerberosV/src/appl/login/osfc2.c
@@ -42,7 +42,7 @@ do_osfc2_magic(uid_t uid)
     char *argv[2];
     
     /* fake */
-    argv[0] = (char*)getprogname();
+    argv[0] = __progname;
     argv[1] = NULL;
     set_auth_parameters(1, argv);
     
diff --git a/kerberosV/src/appl/otp/otp.c b/kerberosV/src/appl/otp/otp.c
index 236faaa81e3..523d485a5a1 100644
--- a/kerberosV/src/appl/otp/otp.c
+++ b/kerberosV/src/appl/otp/otp.c
@@ -293,7 +293,6 @@ main (int argc, char **argv)
     OtpAlgorithm *alg = otp_find_alg (OTP_ALG_DEFAULT);
     int optind = 0;
   
-    setprogname (argv[0]);
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
     if(help_flag)
diff --git a/kerberosV/src/appl/otp/otpprint.c b/kerberosV/src/appl/otp/otpprint.c
index 2bec9cd4ea6..a43822a74ab 100644
--- a/kerberosV/src/appl/otp/otpprint.c
+++ b/kerberosV/src/appl/otp/otpprint.c
@@ -101,7 +101,6 @@ main (int argc, char **argv)
     void (*fn)(OtpKey, char *, size_t);
     OtpAlgorithm *alg = otp_find_alg (OTP_ALG_DEFAULT);
 
-    setprogname (argv[0]);
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
     if(help_flag)
diff --git a/kerberosV/src/appl/popper/pop_debug.c b/kerberosV/src/appl/popper/pop_debug.c
index 50cb54d1e40..4943fe1c802 100644
--- a/kerberosV/src/appl/popper/pop_debug.c
+++ b/kerberosV/src/appl/popper/pop_debug.c
@@ -215,8 +215,6 @@ main(int argc, char **argv)
     int ret = 1;
     int optind = 0;
 
-    setprogname(argv[0]);
-
     if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
 		&optind))
 	usage (1);
diff --git a/kerberosV/src/appl/popper/pop_init.c b/kerberosV/src/appl/popper/pop_init.c
index 91cfe33cc04..b696a2fa64e 100644
--- a/kerberosV/src/appl/popper/pop_init.c
+++ b/kerberosV/src/appl/popper/pop_init.c
@@ -254,10 +254,8 @@ pop_init(POP *p,int argcount,char **argmessage)
     /*  Initialize the POP parameter block */
     memset (p, 0, sizeof(POP));
 
-    setprogname(argmessage[0]);
-
     /*  Save my name in a global variable */
-    p->myname = (char*)getprogname();
+    p->myname = __progname;
 
     /*  Get the name of our host */
     gethostname(p->myhost,MaxHostNameLen);
diff --git a/kerberosV/src/appl/push/push.c b/kerberosV/src/appl/push/push.c
index b695663055d..b9dff03bcd9 100644
--- a/kerberosV/src/appl/push/push.c
+++ b/kerberosV/src/appl/push/push.c
@@ -714,8 +714,6 @@ main(int argc, char **argv)
     const char *host, *user, *filename = NULL;
     char *pobox = NULL;
 
-    setprogname (argv[0]);
-
 #ifdef KRB5
     {
 	krb5_error_code ret;
diff --git a/kerberosV/src/appl/rcp/rcp.c b/kerberosV/src/appl/rcp/rcp.c
index ee19652eb1a..ccd54bdb99b 100644
--- a/kerberosV/src/appl/rcp/rcp.c
+++ b/kerberosV/src/appl/rcp/rcp.c
@@ -92,7 +92,6 @@ main(int argc, char **argv)
 	char *targ;
 	int optind = 0;
 
-	setprogname(argv[0]);
 	if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
 		    &optind))
 	    usage (1);
diff --git a/kerberosV/src/appl/rsh/rsh.c b/kerberosV/src/appl/rsh/rsh.c
index a9ea1b7bac8..53b865fd9b0 100644
--- a/kerberosV/src/appl/rsh/rsh.c
+++ b/kerberosV/src/appl/rsh/rsh.c
@@ -840,8 +840,6 @@ main(int argc, char **argv)
     if (setuid (uid) || (uid != 0 && setuid(0) == 0))
 	err (1, "setuid");
     
-    setprogname (argv[0]);
-
     if (argc >= 2 && argv[1][0] != '-') {
 	host = argv[host_index = 1];
 	optind = 1;
diff --git a/kerberosV/src/appl/rsh/rshd.c b/kerberosV/src/appl/rsh/rshd.c
index b395307268f..d62aaebc1d1 100644
--- a/kerberosV/src/appl/rsh/rshd.c
+++ b/kerberosV/src/appl/rsh/rshd.c
@@ -875,7 +875,7 @@ usage (int ret)
 			NULL,
 			"");
     else
-	syslog (LOG_ERR, "Usage: %s [-ikxlvPL] [-p port]", getprogname());
+	syslog (LOG_ERR, "Usage: %s [-ikxlvPL] [-p port]", __progname);
     exit (ret);
 }
 
@@ -886,7 +886,6 @@ main(int argc, char **argv)
     int optind = 0;
     int port = 0;
 
-    setprogname (argv[0]);
     roken_openlog ("rshd", LOG_ODELAY | LOG_PID, LOG_AUTH);
 
     if (getarg(args, sizeof(args) / sizeof(args[0]), argc, argv,
diff --git a/kerberosV/src/appl/su/su.c b/kerberosV/src/appl/su/su.c
index a176c43b2ea..354e5ae346c 100644
--- a/kerberosV/src/appl/su/su.c
+++ b/kerberosV/src/appl/su/su.c
@@ -292,8 +292,6 @@ main(int argc, char **argv)
     int ok = 0;
     int kerberos_error=1;
 
-    setprogname (argv[0]);
-
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
 
diff --git a/kerberosV/src/appl/xnlock/xnlock.c b/kerberosV/src/appl/xnlock/xnlock.c
index e7c5ac1a90a..27b00d6895e 100644
--- a/kerberosV/src/appl/xnlock/xnlock.c
+++ b/kerberosV/src/appl/xnlock/xnlock.c
@@ -199,7 +199,7 @@ get_words(void)
 static void
 usage(void)
 {
-    fprintf(stderr, "usage: %s [options] [message]\n", getprogname());
+    fprintf(stderr, "usage: %s [options] [message]\n", __progname);
     fprintf(stderr, "-fg color     foreground color\n");
     fprintf(stderr, "-bg color     background color\n");
     fprintf(stderr, "-rv           reverse foreground/background colors\n");
@@ -941,8 +941,6 @@ main (int argc, char **argv)
     Widget override;
     XGCValues gcvalues;
 
-    setprogname (argv[0]);
-
     /*
      * Must be setuid root to read /etc/shadow, copy encrypted
      * passwords here and then switch to sane uid.
diff --git a/kerberosV/src/kadmin/add-random-users.c b/kerberosV/src/kadmin/add-random-users.c
index 52e2481a392..99c2f49f92e 100644
--- a/kerberosV/src/kadmin/add-random-users.c
+++ b/kerberosV/src/kadmin/add-random-users.c
@@ -146,7 +146,6 @@ main(int argc, char **argv)
 {
     int optind = 0;
 
-    setprogname(argv[0]);
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
     if (help_flag)
diff --git a/kerberosV/src/kadmin/kadmin.c b/kerberosV/src/kadmin/kadmin.c
index b10b30f9539..afdc9ff7a05 100644
--- a/kerberosV/src/kadmin/kadmin.c
+++ b/kerberosV/src/kadmin/kadmin.c
@@ -225,8 +225,6 @@ main(int argc, char **argv)
     kadm5_config_params conf;
     int optind = 0;
 
-    setprogname(argv[0]);
-
     ret = krb5_init_context(&context);
     if (ret)
 	errx (1, "krb5_init_context failed: %d", ret);
diff --git a/kerberosV/src/kadmin/kadmind.c b/kerberosV/src/kadmin/kadmind.c
index b40c9aeda63..d5148cd01e7 100644
--- a/kerberosV/src/kadmin/kadmind.c
+++ b/kerberosV/src/kadmin/kadmind.c
@@ -98,8 +98,6 @@ main(int argc, char **argv)
     krb5_log_facility *logf;
     krb5_keytab keytab;
 
-    setprogname(argv[0]);
-
     ret = krb5_init_context(&context);
     if (ret)
 	errx (1, "krb5_init_context failed: %d", ret);
diff --git a/kerberosV/src/kdc/hprop.c b/kerberosV/src/kdc/hprop.c
index 5e016fb77d2..08feee31199 100644
--- a/kerberosV/src/kdc/hprop.c
+++ b/kerberosV/src/kdc/hprop.c
@@ -734,8 +734,6 @@ main(int argc, char **argv)
 
     int type = 0;
 
-    setprogname(argv[0]);
-
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
 
diff --git a/kerberosV/src/kdc/hpropd.c b/kerberosV/src/kdc/hpropd.c
index ac4c7505ab1..bc2d7d98235 100644
--- a/kerberosV/src/kdc/hpropd.c
+++ b/kerberosV/src/kdc/hpropd.c
@@ -213,8 +213,6 @@ main(int argc, char **argv)
     int fd_out = -1;
 #endif
 
-    setprogname(argv[0]);
-
     ret = krb5_init_context(&context);
     if(ret)
 	exit(1);
diff --git a/kerberosV/src/kdc/main.c b/kerberosV/src/kdc/main.c
index 6ad713b7924..b2b8d70b68d 100644
--- a/kerberosV/src/kdc/main.c
+++ b/kerberosV/src/kdc/main.c
@@ -48,7 +48,6 @@ int
 main(int argc, char **argv)
 {
     krb5_error_code ret;
-    setprogname(argv[0]);
     
     ret = krb5_init_context(&context);
     if (ret)
diff --git a/kerberosV/src/kpasswd/kpasswd-generator.c b/kerberosV/src/kpasswd/kpasswd-generator.c
index 273843c2953..217e42d4ca4 100644
--- a/kerberosV/src/kpasswd/kpasswd-generator.c
+++ b/kerberosV/src/kpasswd/kpasswd-generator.c
@@ -177,7 +177,6 @@ main(int argc, char **argv)
     int nreq;
     char *end;
 
-    setprogname(argv[0]);
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
     if (help_flag)
diff --git a/kerberosV/src/kuser/generate-requests.c b/kerberosV/src/kuser/generate-requests.c
index 616a75b63fa..7f2873752ea 100644
--- a/kerberosV/src/kuser/generate-requests.c
+++ b/kerberosV/src/kuser/generate-requests.c
@@ -134,7 +134,6 @@ main(int argc, char **argv)
     int nreq;
     char *end;
 
-    setprogname(argv[0]);
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
 
diff --git a/kerberosV/src/kuser/kdecode_ticket.c b/kerberosV/src/kuser/kdecode_ticket.c
index aa071b2c11f..17885a6d31b 100644
--- a/kerberosV/src/kuser/kdecode_ticket.c
+++ b/kerberosV/src/kuser/kdecode_ticket.c
@@ -103,8 +103,6 @@ main(int argc, char **argv)
     krb5_creds in, *out;
     int optind = 0;
 
-    setprogname (argv[0]);
-
     ret = krb5_init_context (&context);
     if (ret)
 	errx(1, "krb5_init_context failed: %d", ret);
diff --git a/kerberosV/src/kuser/kdestroy.c b/kerberosV/src/kuser/kdestroy.c
index 4f9a54ce277..1d059071858 100644
--- a/kerberosV/src/kuser/kdestroy.c
+++ b/kerberosV/src/kuser/kdestroy.c
@@ -68,8 +68,6 @@ main (int argc, char **argv)
     int optind = 0;
     int exit_val = 0;
 
-    setprogname (argv[0]);
-
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
   
diff --git a/kerberosV/src/kuser/kgetcred.c b/kerberosV/src/kuser/kgetcred.c
index f88b3cd5f43..5c9b3bf5cce 100644
--- a/kerberosV/src/kuser/kgetcred.c
+++ b/kerberosV/src/kuser/kgetcred.c
@@ -65,8 +65,6 @@ main(int argc, char **argv)
     krb5_creds in, *out;
     int optind = 0;
 
-    setprogname (argv[0]);
-
     ret = krb5_init_context (&context);
     if (ret)
 	errx(1, "krb5_init_context failed: %d", ret);
diff --git a/kerberosV/src/kuser/kinit.c b/kerberosV/src/kuser/kinit.c
index 5aa3ed2db23..aefac52560e 100644
--- a/kerberosV/src/kuser/kinit.c
+++ b/kerberosV/src/kuser/kinit.c
@@ -547,8 +547,6 @@ main (int argc, char **argv)
     int optind = 0;
     krb5_deltat ticket_life = 0;
 
-    setprogname (argv[0]);
-    
     ret = krb5_init_context (&context);
     if (ret)
 	errx(1, "krb5_init_context failed: %d", ret);
diff --git a/kerberosV/src/kuser/klist.c b/kerberosV/src/kuser/klist.c
index d36af4d3563..415a5154790 100644
--- a/kerberosV/src/kuser/klist.c
+++ b/kerberosV/src/kuser/klist.c
@@ -629,8 +629,6 @@ main (int argc, char **argv)
     int optind = 0;
     int exit_status = 0;
 
-    setprogname (argv[0]);
-
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
     
diff --git a/kerberosV/src/kuser/kverify.c b/kerberosV/src/kuser/kverify.c
index 19ca2c3772a..324d02be773 100644
--- a/kerberosV/src/kuser/kverify.c
+++ b/kerberosV/src/kuser/kverify.c
@@ -64,8 +64,6 @@ main(int argc, char **argv)
     krb5_verify_init_creds_opt verify_options;
     int optind = 0;
 
-    setprogname (argv[0]);
-
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
     
diff --git a/kerberosV/src/lib/asn1/asn1_print.c b/kerberosV/src/lib/asn1/asn1_print.c
index 922639c2276..b75d946ea16 100644
--- a/kerberosV/src/lib/asn1/asn1_print.c
+++ b/kerberosV/src/lib/asn1/asn1_print.c
@@ -224,7 +224,6 @@ main(int argc, char **argv)
 {
     int optind = 0;
 
-    setprogname (argv[0]);
     initialize_asn1_error_table_r (&et_list);
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
diff --git a/kerberosV/src/lib/auth/sia/sia.c b/kerberosV/src/lib/auth/sia/sia.c
index 2d09cb70ff6..cf936773c94 100644
--- a/kerberosV/src/lib/auth/sia/sia.c
+++ b/kerberosV/src/lib/auth/sia/sia.c
@@ -493,8 +493,6 @@ siad_chg_password (sia_collect_func_t *collect,
     char new_pw2[MAX_KPW_LEN+1];
     static struct et_list *et_list;
 
-    setprogname(argv[0]);
-
     SIA_DEBUG(("DEBUG", "siad_chg_password"));
     if(collect == NULL)
 	return SIADFAIL;
diff --git a/kerberosV/src/lib/com_err/compile_et.c b/kerberosV/src/lib/com_err/compile_et.c
index 72eeaf6bb02..751c617c036 100644
--- a/kerberosV/src/lib/com_err/compile_et.c
+++ b/kerberosV/src/lib/com_err/compile_et.c
@@ -196,7 +196,6 @@ main(int argc, char **argv)
     char *p;
     int optind = 0;
 
-    setprogname(argv[0]);
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
     if(help_flag)
diff --git a/kerberosV/src/lib/hdb/convert_db.c b/kerberosV/src/lib/hdb/convert_db.c
index 9595f99a071..7e3a56c58c9 100644
--- a/kerberosV/src/lib/hdb/convert_db.c
+++ b/kerberosV/src/lib/hdb/convert_db.c
@@ -136,8 +136,6 @@ main(int argc, char **argv)
     int optind = 0;
     int master_key_set = 0;
     
-    setprogname(argv[0]);
-
     if(getarg(args, num_args, argc, argv, &optind))
 	krb5_std_usage(1, args, num_args);
 
diff --git a/kerberosV/src/lib/krb5/appdefault.c b/kerberosV/src/lib/krb5/appdefault.c
index a1483157d96..6805cb89b78 100644
--- a/kerberosV/src/lib/krb5/appdefault.c
+++ b/kerberosV/src/lib/krb5/appdefault.c
@@ -35,6 +35,8 @@
 
 RCSID("$KTH: appdefault.c,v 1.6 2001/08/31 09:25:26 joda Exp $");
 
+extern char *__progname;
+
 void
 krb5_appdefault_boolean(krb5_context context, const char *appname, 
 			krb5_realm realm, const char *option,
@@ -42,7 +44,7 @@ krb5_appdefault_boolean(krb5_context context, const char *appname,
 {
     
     if(appname == NULL)
-	appname = getprogname();
+	appname = __progname;
 
     def_val = krb5_config_get_bool_default(context, NULL, def_val, 
 					   "libdefaults", option, NULL);
@@ -83,7 +85,7 @@ krb5_appdefault_string(krb5_context context, const char *appname,
 		       const char *def_val, char **ret_val)
 {
     if(appname == NULL)
-	appname = getprogname();
+	appname = __progname;
 
     def_val = krb5_config_get_string_default(context, NULL, def_val, 
 					     "libdefaults", option, NULL);
diff --git a/kerberosV/src/lib/krb5/init_creds.c b/kerberosV/src/lib/krb5/init_creds.c
index dc6b4407f68..f66e694f6e8 100644
--- a/kerberosV/src/lib/krb5/init_creds.c
+++ b/kerberosV/src/lib/krb5/init_creds.c
@@ -86,7 +86,7 @@ get_config_bool (krb5_context context,
 
 /*
  * set all the values in `opt' to the appropriate values for
- * application `appname' (default to getprogname() if NULL), and realm
+ * application `appname' (default to __progname if NULL), and realm
  * `realm'.  First looks in [appdefaults] but falls back to
  * [realms] or [libdefaults] for some of the values.
  */
diff --git a/kerberosV/src/lib/krb5/prog_setup.c b/kerberosV/src/lib/krb5/prog_setup.c
index 09cc779b1f6..fefae4a9f7f 100644
--- a/kerberosV/src/lib/krb5/prog_setup.c
+++ b/kerberosV/src/lib/krb5/prog_setup.c
@@ -55,7 +55,6 @@ krb5_program_setup(krb5_context *context, int argc, char **argv,
     if(usage == NULL)
 	usage = krb5_std_usage;
 
-    setprogname(argv[0]);
     ret = krb5_init_context(context);
     if (ret)
 	errx (1, "krb5_init_context failed: %d", ret);
diff --git a/kerberosV/src/lib/krb5/verify_krb5_conf.c b/kerberosV/src/lib/krb5/verify_krb5_conf.c
index 55bc35c5031..904404885d3 100644
--- a/kerberosV/src/lib/krb5/verify_krb5_conf.c
+++ b/kerberosV/src/lib/krb5/verify_krb5_conf.c
@@ -324,8 +324,6 @@ main(int argc, char **argv)
     krb5_config_section *tmp_cf;
     int optind = 0;
 
-    setprogname (argv[0]);
-
     ret = krb5_init_context(&context);
     if (ret)
 	errx (1, "krb5_init_context failed");
diff --git a/kerberosV/src/lib/roken/getaddrinfo-test.c b/kerberosV/src/lib/roken/getaddrinfo-test.c
index 51e8ff4efb9..93844250f82 100644
--- a/kerberosV/src/lib/roken/getaddrinfo-test.c
+++ b/kerberosV/src/lib/roken/getaddrinfo-test.c
@@ -46,6 +46,8 @@ static int socktype;
 static int version_flag;
 static int help_flag;
 
+extern char *__progname;
+
 static struct getargs args[] = {
     {"flags",	0,	arg_integer,	&flags,		"flags",	NULL},
     {"family",	0,	arg_integer,	&family,	"family",	NULL},
@@ -112,8 +114,6 @@ main(int argc, char **argv)
     int optind = 0;
     int i;
 
-    setprogname (argv[0]);
-
     if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
 		&optind))
 	usage (1);
@@ -122,7 +122,7 @@ main(int argc, char **argv)
 	usage (0);
 
     if (version_flag) {
-	fprintf (stderr, "%s from %s-%s)\n", getprogname(), PACKAGE, VERSION);
+	fprintf (stderr, "%s from %s-%s)\n", __progname, PACKAGE, VERSION);
 	return 0;
     }
 
diff --git a/kerberosV/src/lib/sl/make_cmds.c b/kerberosV/src/lib/sl/make_cmds.c
index ae84abb72a5..8b1bc4cbbfc 100644
--- a/kerberosV/src/lib/sl/make_cmds.c
+++ b/kerberosV/src/lib/sl/make_cmds.c
@@ -213,7 +213,6 @@ main(int argc, char **argv)
 {
     int optind = 0;
 
-    setprogname(argv[0]);
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
     if(help_flag)
diff --git a/kerberosV/src/lib/sl/sl.c b/kerberosV/src/lib/sl/sl.c
index c3ccfd19e12..86e1f7cbccb 100644
--- a/kerberosV/src/lib/sl/sl.c
+++ b/kerberosV/src/lib/sl/sl.c
@@ -39,6 +39,8 @@ RCSID("$KTH: sl.c,v 1.29 2001/02/20 01:44:55 assar Exp $");
 #include "sl_locl.h"
 #include <setjmp.h>
 
+extern char *__progname;
+
 static size_t
 print_sl (FILE *stream, int mdoc, int longp, SL_cmd *c)
     __attribute__ ((unused));
@@ -76,8 +78,8 @@ mandoc_template(SL_cmd *cmds,
     t = time(NULL);
     strftime(timestr, sizeof(timestr), "%b %d, %Y", localtime(&t));
     printf(".Dd %s\n", timestr);
-    p = strrchr(getprogname(), '/');
-    if(p) p++; else p = getprogname();
+    p = strrchr(__progname, '/');
+    if(p) p++; else p = __progname;
     strncpy(cmd, p, sizeof(cmd));
     cmd[sizeof(cmd)-1] = '\0';
     strupr(cmd);
diff --git a/kerberosV/src/lib/vers/print_version.c b/kerberosV/src/lib/vers/print_version.c
index 11a6934428b..21b047820a7 100644
--- a/kerberosV/src/lib/vers/print_version.c
+++ b/kerberosV/src/lib/vers/print_version.c
@@ -39,6 +39,8 @@ RCSID("$KTH: print_version.c,v 1.3 2001/04/21 16:05:48 joda Exp $");
 
 #include "print_version.h"
 
+char *__progname;
+
 void
 print_version(const char *progname)
 {
@@ -49,7 +51,7 @@ print_version(const char *progname)
     int i;
     
     if(progname == NULL)
-	progname = getprogname();
+	progname = __progname;
     
     if(num_args == 0)
 	msg = "no version information";