Changeset 988 for vendor/current/examples/auth

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/examples/auth

Files:

• auth_skel.c (modified) (3 diffs)
• wscript_build (added)

vendor/current/examples/auth/auth_skel.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
@@ -27 +28 @@
                                          void *my_private_data, 
                                          TALLOC_CTX *mem_ctx,
-                                         const auth_usersupplied_info *user_info, 
-                                         auth_serversupplied_info **server_info)
+                                         const struct auth_usersupplied_info *user_info,
+                                         struct auth_serversupplied_info **server_info)
 {
         if (!user_info || !auth_context) {
@@ -42 +43 @@
 
 /* module initialisation */
-NTSTATUS auth_init_skel(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
+static NTSTATUS auth_init_skel(struct auth_context *auth_context, const char *param, auth_methods **auth_method)
 {
-        if (!make_auth_methods(auth_context, auth_method)) {
+        struct auth_methods *result;
+
+        result = talloc_zero(auth_context, struct auth_methods);
+        if (result == NULL) {
                 return NT_STATUS_NO_MEMORY;
         }
+        result->name = "skel";
+        result->auth = check_skel_security;
 
-        (*auth_method)->auth = check_skel_security;
-        (*auth_method)->name = "skel";
+        if (param && *param) {
+                /* we load the 'fallback' module - if skel isn't here, call this
+                   module */
+                auth_methods *priv;
+                if (!load_auth_module(auth_context, param, &priv)) {
+                        return NT_STATUS_UNSUCCESSFUL;
+                }
+                result->private_data = (void *)priv;
+        }
+
+        *auth_method = result;
         return NT_STATUS_OK;
 }
 
-NTSTATUS init_module(void)
+NTSTATUS auth_skel_init(void);
+NTSTATUS auth_skel_init(void)
 {
         return smb_register_auth(AUTH_INTERFACE_VERSION, "skel", auth_init_skel);