r25109: Remove obsolete argument from ads_guess_service_principal().

Guenther
(This used to be commit 2dea9464bba76af4315a8207ccd3e564ec19d146)

diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index 123ad491fb34d28833cfde8ae13c18557a009bb5..a92bef7ecf2c20bde035def34d906db5c3fd0edb 100644 (file)
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -667,8 +667,7 @@ static ADS_STATUS ads_generate_service_principal(ADS_STRUCT *ads,
        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 @@ static ADS_STATUS ads_sasl_gssapi_bind(ADS_STRUCT *ads)
        return status;
 }
 
-#endif /* HAVE_GGSAPI */
+#endif /* HAVE_GSSAPI */
 
 /* mapping between SASL mechanisms and functions */
 static struct {

diff --git a/source3/libads/util.c b/source3/libads/util.c
index a0c9d8f4c4b1db516e030986f3efc39ef9f22403..af96c3e10a458622b39a34d4342bbc29eada9204 100644 (file)
--- a/source3/libads/util.c
+++ b/source3/libads/util.c
@@ -53,7 +53,6 @@ failed:
 }
 
 ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
-                                      const char *given_principal,
                                       char **returned_principal)
 {
        char *princ = NULL;