svn commit: samba r25109 - in branches: SAMBA_3_2/source/libads SAMBA_3_2_0/source/libads

[gd at samba.org]

Author: gd
Date: 2007-09-11 23:35:17 +0000 (Tue, 11 Sep 2007)
New Revision: 25109

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

Log:
Remove obsolete argument from ads_guess_service_principal().

Guenther

Modified:
   branches/SAMBA_3_2/source/libads/sasl.c
   branches/SAMBA_3_2/source/libads/util.c
   branches/SAMBA_3_2_0/source/libads/sasl.c
   branches/SAMBA_3_2_0/source/libads/util.c


Changeset:
Modified: branches/SAMBA_3_2/source/libads/sasl.c
===================================================================
--- branches/SAMBA_3_2/source/libads/sasl.c	2007-09-11 23:21:50 UTC (rev 25108)
+++ branches/SAMBA_3_2/source/libads/sasl.c	2007-09-11 23:35:17 UTC (rev 25109)
@@ -667,8 +667,7 @@
 	if (!given_principal ||
 	    strequal(given_principal, ADS_IGNORE_PRINCIPAL)) {
 
-		status = ads_guess_service_principal(ads, given_principal,
-						     &p->string);
+		status = ads_guess_service_principal(ads, &p->string);
 		if (!ADS_ERR_OK(status)) {
 			return status;
 		}
@@ -1103,7 +1102,7 @@
 	return status;
 }
 
-#endif /* HAVE_GGSAPI */
+#endif /* HAVE_GSSAPI */
 
 /* mapping between SASL mechanisms and functions */
 static struct {

Modified: branches/SAMBA_3_2/source/libads/util.c
===================================================================
--- branches/SAMBA_3_2/source/libads/util.c	2007-09-11 23:21:50 UTC (rev 25108)
+++ branches/SAMBA_3_2/source/libads/util.c	2007-09-11 23:35:17 UTC (rev 25109)
@@ -53,7 +53,6 @@
 }
 
 ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
-				       const char *given_principal,
 				       char **returned_principal)
 {
 	char *princ = NULL;

Modified: branches/SAMBA_3_2_0/source/libads/sasl.c
===================================================================
--- branches/SAMBA_3_2_0/source/libads/sasl.c	2007-09-11 23:21:50 UTC (rev 25108)
+++ branches/SAMBA_3_2_0/source/libads/sasl.c	2007-09-11 23:35:17 UTC (rev 25109)
@@ -667,8 +667,7 @@
 	if (!given_principal ||
 	    strequal(given_principal, ADS_IGNORE_PRINCIPAL)) {
 
-		status = ads_guess_service_principal(ads, given_principal,
-						     &p->string);
+		status = ads_guess_service_principal(ads, &p->string);
 		if (!ADS_ERR_OK(status)) {
 			return status;
 		}
@@ -1103,7 +1102,7 @@
 	return status;
 }
 
-#endif /* HAVE_GGSAPI */
+#endif /* HAVE_GSSAPI */
 
 /* mapping between SASL mechanisms and functions */
 static struct {

Modified: branches/SAMBA_3_2_0/source/libads/util.c
===================================================================
--- branches/SAMBA_3_2_0/source/libads/util.c	2007-09-11 23:21:50 UTC (rev 25108)
+++ branches/SAMBA_3_2_0/source/libads/util.c	2007-09-11 23:35:17 UTC (rev 25109)
@@ -53,7 +53,6 @@
 }
 
 ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
-				       const char *given_principal,
 				       char **returned_principal)
 {
 	char *princ = NULL;