svn commit: samba r23586 - in branches: SAMBA_3_0/source/libsmb SAMBA_3_0_25/source/libsmb SAMBA_3_0_26/source/libsmb

[gd at samba.org]

Author: gd
Date: 2007-06-22 14:43:42 +0000 (Fri, 22 Jun 2007)
New Revision: 23586

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23586

Log:
Fix heimdal path in the krb5 renew routine when we need to compose the tgt
string ourselves.

Guenther

Modified:
   branches/SAMBA_3_0/source/libsmb/clikrb5.c
   branches/SAMBA_3_0_25/source/libsmb/clikrb5.c
   branches/SAMBA_3_0_26/source/libsmb/clikrb5.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clikrb5.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clikrb5.c	2007-06-22 11:43:50 UTC (rev 23585)
+++ branches/SAMBA_3_0/source/libsmb/clikrb5.c	2007-06-22 14:43:42 UTC (rev 23586)
@@ -1223,7 +1223,11 @@
 			}
 		} else {
 			/* build tgt service by default */
-			client_realm = krb5_princ_realm(context, client);
+			client_realm = krb5_princ_realm(context, creds_in.client);
+			if (!client_realm) {
+				ret = ENOMEM;
+				goto done;
+			}
 			ret = krb5_make_principal(context, &creds_in.server, *client_realm, KRB5_TGS_NAME, *client_realm, NULL);
 			if (ret) {
 				goto done;

Modified: branches/SAMBA_3_0_25/source/libsmb/clikrb5.c
===================================================================
--- branches/SAMBA_3_0_25/source/libsmb/clikrb5.c	2007-06-22 11:43:50 UTC (rev 23585)
+++ branches/SAMBA_3_0_25/source/libsmb/clikrb5.c	2007-06-22 14:43:42 UTC (rev 23586)
@@ -1184,7 +1184,11 @@
 			}
 		} else {
 			/* build tgt service by default */
-			client_realm = krb5_princ_realm(context, client);
+			client_realm = krb5_princ_realm(context, creds_in.client);
+			if (!client_realm) {
+				ret = ENOMEM;
+				goto done;
+			}
 			ret = krb5_make_principal(context, &creds_in.server, *client_realm, KRB5_TGS_NAME, *client_realm, NULL);
 			if (ret) {
 				goto done;

Modified: branches/SAMBA_3_0_26/source/libsmb/clikrb5.c
===================================================================
--- branches/SAMBA_3_0_26/source/libsmb/clikrb5.c	2007-06-22 11:43:50 UTC (rev 23585)
+++ branches/SAMBA_3_0_26/source/libsmb/clikrb5.c	2007-06-22 14:43:42 UTC (rev 23586)
@@ -1223,7 +1223,11 @@
 			}
 		} else {
 			/* build tgt service by default */
-			client_realm = krb5_princ_realm(context, client);
+			client_realm = krb5_princ_realm(context, creds_in.client);
+			if (!client_realm) {
+				ret = ENOMEM;
+				goto done;
+			}
 			ret = krb5_make_principal(context, &creds_in.server, *client_realm, KRB5_TGS_NAME, *client_realm, NULL);
 			if (ret) {
 				goto done;