Attachment 617 Details for Bug 1661 – krb5_setpw.c.diff

[patch] krb5_setpw.c.diff

difs (text/plain), 1.76 KB, created by Luke Mewburn on 2004-08-24 23:10:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luke Mewburn

Created: 2004-08-24 23:10:25 UTC

Size: 1.76 KB

patch

obsolete

>Index: libads/krb5_setpw.c
>===================================================================
>RCS file: /cvsroot/wasabisrc/dist/samba/source/libads/krb5_setpw.c,v
>retrieving revision 1.1.1.4
>retrieving revision 1.2
>diff -p -p -u -r1.1.1.4 -r1.2
>--- libads/krb5_setpw.c	8 Jul 2004 17:06:16 -0000	1.1.1.4
>+++ libads/krb5_setpw.c	24 Aug 2004 08:49:34 -0000	1.2
>@@ -25,8 +25,7 @@
> 
> #define DEFAULT_KPASSWD_PORT	464
> #define KRB5_KPASSWD_VERS_CHANGEPW		1
>-#define KRB5_KPASSWD_VERS_SETPW			2
>-#define KRB5_KPASSWD_VERS_SETPW_MS		0xff80
>+#define KRB5_KPASSWD_VERS_SETPW			0xff80
> #define KRB5_KPASSWD_ACCESSDENIED		5
> #define KRB5_KPASSWD_BAD_VERSION		6
> #define KRB5_KPASSWD_INITIAL_FLAG_NEEDED	7
>@@ -137,8 +136,7 @@ static krb5_error_code build_kpasswd_req
> 	/* handle protocol differences in chpw and setpw */
> 	if (pversion  == KRB5_KPASSWD_VERS_CHANGEPW)
> 		setpw = data_blob(passwd, strlen(passwd));
>-	else if (pversion == KRB5_KPASSWD_VERS_SETPW ||
>-		 pversion == KRB5_KPASSWD_VERS_SETPW_MS)
>+	else if (pversion == KRB5_KPASSWD_VERS_SETPW)
> 		setpw = encode_krb5_setpw(princ, passwd);
> 	else
> 		return EINVAL;
>@@ -250,7 +248,6 @@ static krb5_error_code parse_setpw_reply
> 
> 	/* FIXME: According to standard there is only one type of reply */	
> 	if (vnum != KRB5_KPASSWD_VERS_SETPW && 
>-	    vnum != KRB5_KPASSWD_VERS_SETPW_MS && 
> 	    vnum != KRB5_KPASSWD_VERS_CHANGEPW) {
> 		DEBUG(1,("Bad vnum (%d) from kpasswd server\n", vnum));
> 		return KRB5KDC_ERR_BAD_PVNO;
>@@ -555,7 +552,7 @@ ADS_STATUS ads_krb5_set_password(const c
> 	/* we might have to call krb5_free_creds(...) from now on ... */
> 
> 	aret = do_krb5_kpasswd_request(context, kdc_host,
>-				       KRB5_KPASSWD_VERS_SETPW_MS,
>+				       KRB5_KPASSWD_VERS_SETPW,
> 				       credsp, princ, newpw);
> 
> 	krb5_free_creds(context, credsp);

Actions: View

Attachments on bug 1661: 617 | 750 | 759