Changeset 745 for trunk/server/source3/winbindd/nss_info.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/winbindd/nss_info.c (modified) (11 diffs)

trunk/server/source3/winbindd/nss_info.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include "ads.h"
 #include "nss_info.h"
 
@@ -88 +89 @@
 {
         char *p;
-        char *q;
-        int len;
 
         *backend = *domain = NULL;
@@ -111 +110 @@
         }
 
-        len = PTR_DIFF(p,config)+1;
-        if ( (q = SMB_MALLOC_ARRAY( char, len )) == NULL ) {
-                SAFE_FREE( *backend );
-                return False;
-        }
-
-        StrnCpy( q, config, len-1);
-        q[len-1] = '\0';
-        *backend = q;
-
-        return True;
+        *backend = SMB_STRNDUP(config, PTR_DIFF(p, config));
+        return (*backend != NULL);
 }
 
@@ -165 +155 @@
  *******************************************************************/
 
- NTSTATUS nss_init( const char **nss_list )
+static NTSTATUS nss_init(const char **nss_list)
 {
         NTSTATUS status;
-        static NTSTATUS nss_initialized = NT_STATUS_UNSUCCESSFUL;
+        static bool nss_initialized = false;
         int i;
         char *backend, *domain;
@@ -175 +165 @@
         /* check for previous successful initializations */
 
-        if ( NT_STATUS_IS_OK(nss_initialized) )
+        if (nss_initialized) {
                 return NT_STATUS_OK;
-
-        /* The "template" backend should alqays be registered as it
+        }
+
+        /* The "template" backend should always be registered as it
            is a static module */
 
-        if ( (nss_backend = nss_get_backend( "template" )) == NULL ) {
+        nss_backend = nss_get_backend("template");
+        if (nss_backend == NULL) {
                 static_init_nss_info;
         }
@@ -201 +193 @@
                 /* validate the backend */
 
-                if ( (nss_backend = nss_get_backend( backend )) == NULL ) {
+                nss_backend = nss_get_backend(backend);
+                if (nss_backend == NULL) {
+                        /*
+                         * This is a freaking hack. We don't have proper
+                         * modules for nss_info backends. Right now we have
+                         * our standard nss_info backends in the ad backend.
+                         */
+                        status = smb_probe_module("idmap", "ad");
+                        if ( !NT_STATUS_IS_OK(status) ) {
+                                continue;
+                        }
+                }
+
+                nss_backend = nss_get_backend(backend);
+                if (nss_backend == NULL) {
                         /* attempt to register the backend */
                         status = smb_probe_module( "nss_info", backend );
@@ -207 +213 @@
                                 continue;
                         }
-
-                        /* try again */
-                        if ( (nss_backend = nss_get_backend( backend )) == NULL ) {
-                                DEBUG(0,("nss_init: unregistered backend %s!.  Skipping\n",
-                                         backend));
-                                continue;
-                        }
+                }
+
+                /* try again */
+                nss_backend = nss_get_backend(backend);
+                if (nss_backend == NULL) {
+                        DEBUG(0, ("nss_init: unregistered backend %s!. "
+                                  "Skipping\n", backend));
+                        continue;
                 }
 
@@ -242 +249 @@
 
 
-                /* we shouild default to use template here */
-        }
-
-        nss_initialized = NT_STATUS_OK;
+                /* we should default to use template here */
+        }
+
+        nss_initialized = true;
 
         return NT_STATUS_OK;
@@ -260 +267 @@
         status = nss_init( lp_winbind_nss_info() );
         if ( !NT_STATUS_IS_OK(status) ) {
-                DEBUG(4,("nss_get_info: Failed to init nss_info API (%s)!\n",
-                         nt_errstr(status)));
+                DEBUG(4,("find_nss_domain: Failed to init nss_info API "
+                         "(%s)!\n", nt_errstr(status)));
                 return NULL;
         }
@@ -300 +307 @@
  *******************************************************************/
 
-NTSTATUS nss_get_info( const char *domain, const DOM_SID *user_sid,
+NTSTATUS nss_get_info( const char *domain, const struct dom_sid *user_sid,
                        TALLOC_CTX *ctx,
-                       ADS_STRUCT *ads, LDAPMessage *msg,
                        const char **homedir, const char **shell,
                        const char **gecos, gid_t *p_gid)
@@ -320 +326 @@
         m = p->backend->methods;
 
-        return m->get_nss_info( p, user_sid, ctx, ads, msg,
+        return m->get_nss_info( p, user_sid, ctx,
                                 homedir, shell, gecos, p_gid );
 }