s3-libads: make ads_guess_service_principal static.

Guenther

diff --git a/source3/libads/ads_proto.h b/source3/libads/ads_proto.h
index 6fbd3aa13f3e5fb1fc2f4fdc08418799b14e885e..040825e674ceb0e701c0ba72a32f62fd70ea97f5 100644 (file)
--- a/source3/libads/ads_proto.h
+++ b/source3/libads/ads_proto.h
@@ -152,5 +152,3 @@ ADS_STATUS ads_setup_sasl_wrapping(ADS_STRUCT *ads,
 /* The following definitions come from libads/util.c  */
 
 ADS_STATUS ads_change_trust_account_password(ADS_STRUCT *ads, char *host_principal);
-ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
-                                      char **returned_principal);

diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index 2ba347486a6f6366d6e2cad50c9d7c2068486471..e7daa8aec636873a3ffc0ddc57a1c1d937006465 100644 (file)
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -644,6 +644,75 @@ static void ads_free_service_principal(struct ads_service_principal *p)
        ZERO_STRUCTP(p);
 }
 
+
+static ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
+                                             char **returned_principal)
+{
+       char *princ = NULL;
+
+       if (ads->server.realm && ads->server.ldap_server) {
+               char *server, *server_realm;
+
+               server = SMB_STRDUP(ads->server.ldap_server);
+               server_realm = SMB_STRDUP(ads->server.realm);
+
+               if (!server || !server_realm) {
+                       SAFE_FREE(server);
+                       SAFE_FREE(server_realm);
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+
+               strlower_m(server);
+               strupper_m(server_realm);
+               if (asprintf(&princ, "ldap/%s@%s", server, server_realm) == -1) {
+                       SAFE_FREE(server);
+                       SAFE_FREE(server_realm);
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+
+               SAFE_FREE(server);
+               SAFE_FREE(server_realm);
+
+               if (!princ) {
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+       } else if (ads->config.realm && ads->config.ldap_server_name) {
+               char *server, *server_realm;
+
+               server = SMB_STRDUP(ads->config.ldap_server_name);
+               server_realm = SMB_STRDUP(ads->config.realm);
+
+               if (!server || !server_realm) {
+                       SAFE_FREE(server);
+                       SAFE_FREE(server_realm);
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+
+               strlower_m(server);
+               strupper_m(server_realm);
+               if (asprintf(&princ, "ldap/%s@%s", server, server_realm) == -1) {
+                       SAFE_FREE(server);
+                       SAFE_FREE(server_realm);
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+
+               SAFE_FREE(server);
+               SAFE_FREE(server_realm);
+
+               if (!princ) {
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+       }
+
+       if (!princ) {
+               return ADS_ERROR(LDAP_PARAM_ERROR);
+       }
+
+       *returned_principal = princ;
+
+       return ADS_SUCCESS;
+}
+
 static ADS_STATUS ads_generate_service_principal(ADS_STRUCT *ads,
                                                 const char *given_principal,
                                                 struct ads_service_principal *p)

diff --git a/source3/libads/util.c b/source3/libads/util.c
index 44b4c78038e7f74a9558d3d10ac2463d2d93f86e..6a6b42afc432679b8fa3e3648ad36f1aef03e847 100644 (file)
--- a/source3/libads/util.c
+++ b/source3/libads/util.c
@@ -53,73 +53,4 @@ failed:
        SAFE_FREE(password);
        return ret;
 }
-
-ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
-                                      char **returned_principal)
-{
-       char *princ = NULL;
-
-       if (ads->server.realm && ads->server.ldap_server) {
-               char *server, *server_realm;
-
-               server = SMB_STRDUP(ads->server.ldap_server);
-               server_realm = SMB_STRDUP(ads->server.realm);
-
-               if (!server || !server_realm) {
-                       SAFE_FREE(server);
-                       SAFE_FREE(server_realm);
-                       return ADS_ERROR(LDAP_NO_MEMORY);
-               }
-
-               strlower_m(server);
-               strupper_m(server_realm);
-               if (asprintf(&princ, "ldap/%s@%s", server, server_realm) == -1) {
-                       SAFE_FREE(server);
-                       SAFE_FREE(server_realm);
-                       return ADS_ERROR(LDAP_NO_MEMORY);
-               }
-
-               SAFE_FREE(server);
-               SAFE_FREE(server_realm);
-
-               if (!princ) {
-                       return ADS_ERROR(LDAP_NO_MEMORY);
-               }
-       } else if (ads->config.realm && ads->config.ldap_server_name) {
-               char *server, *server_realm;
-
-               server = SMB_STRDUP(ads->config.ldap_server_name);
-               server_realm = SMB_STRDUP(ads->config.realm);
-
-               if (!server || !server_realm) {
-                       SAFE_FREE(server);
-                       SAFE_FREE(server_realm);
-                       return ADS_ERROR(LDAP_NO_MEMORY);
-               }
-
-               strlower_m(server);
-               strupper_m(server_realm);
-               if (asprintf(&princ, "ldap/%s@%s", server, server_realm) == -1) {
-                       SAFE_FREE(server);
-                       SAFE_FREE(server_realm);
-                       return ADS_ERROR(LDAP_NO_MEMORY);
-               }
-
-               SAFE_FREE(server);
-               SAFE_FREE(server_realm);
-
-               if (!princ) {
-                       return ADS_ERROR(LDAP_NO_MEMORY);
-               }
-       }
-
-       if (!princ) {
-               return ADS_ERROR(LDAP_PARAM_ERROR);
-       }
-
-       *returned_principal = princ;
-
-       return ADS_SUCCESS;
-}
-
 #endif