Attachment 10351 Details for Bug 20779 – passwd-krb.diff

[patch] passwd-krb.diff

passwd-krb.diff (text/plain), 2.67 KB, created by assar on 2001-03-08 05:06:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: assar

Created: 2001-03-08 05:06:26 UTC

Size: 2.67 KB

patch

obsolete

>Index: usr.bin/passwd/passwd.c
>===================================================================
>RCS file: /home/ncvs/src/usr.bin/passwd/passwd.c,v
>retrieving revision 1.16
>diff -u -w -r1.16 passwd.c
>--- usr.bin/passwd/passwd.c	1999/08/28 01:04:52	1.16
>+++ usr.bin/passwd/passwd.c	2001/03/08 04:53:37
>@@ -216,6 +216,7 @@
> 		k = auth_getval("auth_list");
> 		if (k && strstr(k, "kerberos"))
> 		if(krb_get_lrealm(realm, 0) == KSUCCESS) {
>+			setuid(getuid());
> 			fprintf(stderr, "realm %s\n", realm);
> 			exit(krb_passwd(argv[0], iflag, rflag, uflag));
> 		}
>Index: crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c
>===================================================================
>RCS file: /home/ncvs/src/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c,v
>retrieving revision 1.1.1.3
>diff -u -w -r1.1.1.3 kadm_cli_wrap.c
>--- crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c	2000/01/09 08:28:09	1.1.1.3
>+++ crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c	2001/03/08 04:53:37
>@@ -165,6 +165,8 @@
> 	int retval;
> 	char tmp[4];
> 
>+	*ret_dat = NULL;
>+	*ret_siz = 0;
> 	dlen = (u_int16_t) dat_len;
> 
> 	if (dat_len != (int)dlen)
>@@ -193,6 +195,8 @@
> 
> 	if ((retval = krb_net_read(client_parm.admin_fd,  *ret_dat,
> 				   dlen) != dlen)) {
>+	    free(*ret_dat);
>+	    *ret_dat = NULL;
> 	    if (retval < 0)
> 		return(errno);		/* XXX */
> 	    else
>@@ -238,6 +242,9 @@
> 	int tmp;
> 	void *tmp_ptr;
> 
>+	*ret_dat = NULL;
>+	*ret_siz = 0;
>+
> 	act_st = malloc(KADM_VERSIZE); /* verstr stored first */
> 	if (act_st == NULL) {
> 	    clear_secrets ();
>@@ -309,7 +316,7 @@
> 	    clear_secrets();
> 	    return retdat;
> 	}
>-#define RET_N_FREE2(r) {free(*ret_dat); clear_secrets(); return(r);}
>+#define RET_N_FREE2(r) {free(*ret_dat); *ret_dat = NULL; clear_secrets(); return(r);}
> 
> 	/* first see if it's a YOULOUSE */
> 	if ((*ret_siz >= KADM_VERSIZE) &&
>@@ -410,8 +417,6 @@
> 	    msg[0]=0;
> 	  *pw_msg=msg;
> 	}
>-
>-	if (ret_st)
> 	    free(ret_st);
> 	
> 	kadm_cli_disconn();
>@@ -481,8 +486,8 @@
> 	    /* ret_st has vals */
> 	    if (stream_to_vals(ret_st, vals, ret_sz) < 0)
> 		retc = KADM_LENGTH_ERROR;
>-	    free(ret_st);
> 	}
>+	free(ret_st);
> 	kadm_cli_disconn();
> 	return(retc);
> }
>@@ -539,8 +544,8 @@
> 	    /* ret_st has vals */
> 	    if (stream_to_vals(ret_st, vals2, ret_sz) < 0)
> 		retc = KADM_LENGTH_ERROR;
>-	    free(ret_st);
> 	}
>+	free(ret_st);
> 	kadm_cli_disconn();
> 	return(retc);
> }
>@@ -571,6 +576,7 @@
>     }
>     retc = kadm_cli_send(st2, st_len + 1, &ret_st, &ret_sz);
>     free(st2);
>+    free(ret_st);
>     kadm_cli_disconn();
>     return(retc);
> }
>@@ -618,8 +624,8 @@
> 	    /* ret_st has vals */
> 	    if (stream_to_vals(ret_st, vals, ret_sz) < 0)
> 		retc = KADM_LENGTH_ERROR;
>-	    free(ret_st);
> 	}
>+	free(ret_st);
> 	kadm_cli_disconn();
> 	return(retc);
> }

Actions: View | Diff

Attachments on bug 20779: 10351