s4-auth Rename auth -> auth4 to avoid conflict with s3 auth

diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index 74f9f860a6b8756564446bae5b64ea689eb65ff5..04731af0190dc8ba72cf353c288b202dac84890b 100644 (file)
--- a/source4/auth/auth.h
+++ b/source4/auth/auth.h
@@ -43,7 +43,7 @@ struct loadparm_context;
 /* version 3 - subsequent samba4 version - abartlet */
 /* version 4 - subsequent samba4 version - metze */
 /* version 0 - till samba4 is stable - metze */
-#define AUTH_INTERFACE_VERSION 0
+#define AUTH4_INTERFACE_VERSION 0
 
 #define AUTH_SESSION_INFO_DEFAULT_GROUPS     0x01 /* Add the user to the default world and network groups */
 #define AUTH_SESSION_INFO_AUTHENTICATED      0x02 /* Add the user to the 'authenticated users' group */
@@ -51,7 +51,7 @@ struct loadparm_context;
 
 struct auth_method_context;
 struct auth_check_password_request;
-struct auth_context;
+struct auth4_context;
 struct auth_session_info;
 struct ldb_dn;
 
@@ -78,7 +78,7 @@ struct auth_operations {
 
        /* Lookup a 'session info interim' return based only on the principal or DN */
        NTSTATUS (*get_user_info_dc_principal)(TALLOC_CTX *mem_ctx,
-                                                      struct auth_context *auth_context,
+                                                      struct auth4_context *auth_context,
                                                       const char *principal,
                                                       struct ldb_dn *user_dn,
                                                       struct auth_user_info_dc **interim_info);
@@ -86,13 +86,13 @@ struct auth_operations {
 
 struct auth_method_context {
        struct auth_method_context *prev, *next;
-       struct auth_context *auth_ctx;
+       struct auth4_context *auth_ctx;
        const struct auth_operations *ops;
        int depth;
        void *private_data;
 };
 
-struct auth_context {
+struct auth4_context {
        struct {
                /* Who set this up in the first place? */
                const char *set_by;
@@ -117,25 +117,25 @@ struct auth_context {
        /* SAM database for this local machine - to fill in local groups, or to authenticate local NTLM users */
        struct ldb_context *sam_ctx;
 
-       NTSTATUS (*check_password)(struct auth_context *auth_ctx,
+       NTSTATUS (*check_password)(struct auth4_context *auth_ctx,
                                   TALLOC_CTX *mem_ctx,
                                   const struct auth_usersupplied_info *user_info,
                                   struct auth_user_info_dc **user_info_dc);
 
-       NTSTATUS (*get_challenge)(struct auth_context *auth_ctx, uint8_t chal[8]);
+       NTSTATUS (*get_challenge)(struct auth4_context *auth_ctx, uint8_t chal[8]);
 
-       bool (*challenge_may_be_modified)(struct auth_context *auth_ctx);
+       bool (*challenge_may_be_modified)(struct auth4_context *auth_ctx);
 
-       NTSTATUS (*set_challenge)(struct auth_context *auth_ctx, const uint8_t chal[8], const char *set_by);
+       NTSTATUS (*set_challenge)(struct auth4_context *auth_ctx, const uint8_t chal[8], const char *set_by);
 
        NTSTATUS (*get_user_info_dc_principal)(TALLOC_CTX *mem_ctx,
-                                                      struct auth_context *auth_ctx,
+                                                      struct auth4_context *auth_ctx,
                                                       const char *principal,
                                                       struct ldb_dn *user_dn,
                                                       struct auth_user_info_dc **user_info_dc);
 
        NTSTATUS (*generate_session_info)(TALLOC_CTX *mem_ctx,
-                                         struct auth_context *auth_context,
+                                         struct auth4_context *auth_context,
                                          struct auth_user_info_dc *user_info_dc,
                                          uint32_t session_info_flags,
                                          struct auth_session_info **session_info);
@@ -151,7 +151,7 @@ struct auth_critical_sizes {
        int sizeof_auth_user_info_dc;
 };
 
- NTSTATUS encrypt_user_info(TALLOC_CTX *mem_ctx, struct auth_context *auth_context,
+ NTSTATUS encrypt_user_info(TALLOC_CTX *mem_ctx, struct auth4_context *auth_context,
                           enum auth_password_state to_state,
                           const struct auth_usersupplied_info *user_info_in,
                           const struct auth_usersupplied_info **user_info_encrypted);
@@ -165,7 +165,7 @@ struct ldb_context;
 struct gensec_security;
 struct cli_credentials;
 
-NTSTATUS auth_get_challenge(struct auth_context *auth_ctx, uint8_t chal[8]);
+NTSTATUS auth_get_challenge(struct auth4_context *auth_ctx, uint8_t chal[8]);
 NTSTATUS authsam_account_ok(TALLOC_CTX *mem_ctx,
                            struct ldb_context *sam_ctx,
                            uint32_t logon_parameters,
@@ -193,17 +193,17 @@ NTSTATUS auth_context_create_methods(TALLOC_CTX *mem_ctx, const char **methods,
                                     struct imessaging_context *msg,
                                     struct loadparm_context *lp_ctx,
                                     struct ldb_context *sam_ctx,
-                                    struct auth_context **auth_ctx);
+                                    struct auth4_context **auth_ctx);
 const char **auth_methods_from_lp(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
 
 NTSTATUS auth_context_create(TALLOC_CTX *mem_ctx,
                             struct tevent_context *ev,
                             struct imessaging_context *msg,
                             struct loadparm_context *lp_ctx,
-                            struct auth_context **auth_ctx);
-NTSTATUS auth_context_create_from_ldb(TALLOC_CTX *mem_ctx, struct ldb_context *ldb, struct auth_context **auth_ctx);
+                            struct auth4_context **auth_ctx);
+NTSTATUS auth_context_create_from_ldb(TALLOC_CTX *mem_ctx, struct ldb_context *ldb, struct auth4_context **auth_ctx);
 
-NTSTATUS auth_check_password(struct auth_context *auth_ctx,
+NTSTATUS auth_check_password(struct auth4_context *auth_ctx,
                             TALLOC_CTX *mem_ctx,
                             const struct auth_usersupplied_info *user_info,
                             struct auth_user_info_dc **user_info_dc);
@@ -222,17 +222,17 @@ NTSTATUS authenticate_username_pw(TALLOC_CTX *mem_ctx,
 
 struct tevent_req *auth_check_password_send(TALLOC_CTX *mem_ctx,
                                            struct tevent_context *ev,
-                                           struct auth_context *auth_ctx,
+                                           struct auth4_context *auth_ctx,
                                            const struct auth_usersupplied_info *user_info);
 NTSTATUS auth_check_password_recv(struct tevent_req *req,
                                  TALLOC_CTX *mem_ctx,
                                  struct auth_user_info_dc **user_info_dc);
 
-bool auth_challenge_may_be_modified(struct auth_context *auth_ctx);
-NTSTATUS auth_context_set_challenge(struct auth_context *auth_ctx, const uint8_t chal[8], const char *set_by);
+bool auth_challenge_may_be_modified(struct auth4_context *auth_ctx);
+NTSTATUS auth_context_set_challenge(struct auth4_context *auth_ctx, const uint8_t chal[8], const char *set_by);
 
 NTSTATUS auth_get_user_info_dc_principal(TALLOC_CTX *mem_ctx,
-                                       struct auth_context *auth_ctx,
+                                       struct auth4_context *auth_ctx,
                                        const char *principal,
                                        struct ldb_dn *user_dn,
                                        struct auth_user_info_dc **user_info_dc);

diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c
index e632aec2dc09c824a2214b93360126c62ddc3b22..9b0dbfffbc6e4e5ee08131b76bf58c96c5fb1d31 100644 (file)
--- a/source4/auth/gensec/gensec.c
+++ b/source4/auth/gensec/gensec.c
@@ -514,7 +514,7 @@ const char **gensec_security_oids(struct gensec_security *gensec_security,
 static NTSTATUS gensec_start(TALLOC_CTX *mem_ctx, 
                             struct tevent_context *ev,
                             struct gensec_settings *settings,
-                            struct auth_context *auth_context,
+                            struct auth4_context *auth_context,
                             struct gensec_security **gensec_security)
 {
        if (ev == NULL) {
@@ -604,7 +604,7 @@ _PUBLIC_ NTSTATUS gensec_client_start(TALLOC_CTX *mem_ctx,
 _PUBLIC_ NTSTATUS gensec_server_start(TALLOC_CTX *mem_ctx, 
                                      struct tevent_context *ev,
                                      struct gensec_settings *settings,
-                                     struct auth_context *auth_context,
+                                     struct auth4_context *auth_context,
                                      struct gensec_security **gensec_security)
 {
        NTSTATUS status;

diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h
index 48268c421ef03a709037aebdf74e81af7751d121..28bed6c3b76afd5821194d7879ce0882d4e5b63e 100644 (file)
--- a/source4/auth/gensec/gensec.h
+++ b/source4/auth/gensec/gensec.h
@@ -165,7 +165,7 @@ struct gensec_security {
        /* When we are a server, this may be filled in to provide an
         * NTLM authentication backend, and user lookup (such as if no
         * PAC is found) */
-       struct auth_context *auth_context;
+       struct auth4_context *auth_context;
 };
 
 /* this structure is used by backends to determine the size of some critical types */
@@ -179,7 +179,7 @@ struct gensec_critical_sizes {
 
 struct gensec_security;
 struct socket_context;
-struct auth_context;
+struct auth4_context;
 struct auth_user_info_dc;
 
 NTSTATUS gensec_socket_init(struct gensec_security *gensec_security,
@@ -270,7 +270,7 @@ const char *gensec_get_name_by_authtype(struct gensec_security *gensec_security,
 NTSTATUS gensec_server_start(TALLOC_CTX *mem_ctx, 
                             struct tevent_context *ev,
                             struct gensec_settings *settings,
-                            struct auth_context *auth_context,
+                            struct auth4_context *auth_context,
                             struct gensec_security **gensec_security);
 NTSTATUS gensec_session_info(struct gensec_security *gensec_security, 
                             struct auth_session_info **session_info);

diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index fd9726eb754a06b7e275c72cdf223d49d6b08ee4..004cc4a76e1c9d1b4f4556c99f93d03c7afc22c8 100644 (file)
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -156,7 +156,7 @@ static PyObject *py_gensec_start_server(PyTypeObject *type, PyObject *args, PyOb
        PyObject *py_auth_context = Py_None;
        struct tevent_context *ev;
        struct gensec_security *gensec;
-       struct auth_context *auth_context = NULL;
+       struct auth4_context *auth_context = NULL;
 
        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OO", discard_const_p(char *, kwnames), &py_settings, &py_auth_context))
                return NULL;
@@ -201,7 +201,7 @@ static PyObject *py_gensec_start_server(PyTypeObject *type, PyObject *args, PyOb
        }
 
        if (py_auth_context != Py_None) {
-               auth_context = py_talloc_get_type(py_auth_context, struct auth_context);
+               auth_context = py_talloc_get_type(py_auth_context, struct auth4_context);
                if (!auth_context) {
                        PyErr_Format(PyExc_TypeError,
                                     "Expected auth.AuthContext for auth_context argument, got %s",

diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 771474c803d23fadd0c74fe929e57aa03dd1e267..72338ac3c9c3faba4ab4028b0f4b322dca144f0e 100644 (file)
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -31,7 +31,7 @@
 /***************************************************************************
  Set a fixed challenge
 ***************************************************************************/
-_PUBLIC_ NTSTATUS auth_context_set_challenge(struct auth_context *auth_ctx, const uint8_t chal[8], const char *set_by) 
+_PUBLIC_ NTSTATUS auth_context_set_challenge(struct auth4_context *auth_ctx, const uint8_t chal[8], const char *set_by) 
 {
        auth_ctx->challenge.set_by = talloc_strdup(auth_ctx, set_by);
        NT_STATUS_HAVE_NO_MEMORY(auth_ctx->challenge.set_by);
@@ -45,7 +45,7 @@ _PUBLIC_ NTSTATUS auth_context_set_challenge(struct auth_context *auth_ctx, cons
 /***************************************************************************
  Set a fixed challenge
 ***************************************************************************/
-_PUBLIC_ bool auth_challenge_may_be_modified(struct auth_context *auth_ctx)
+_PUBLIC_ bool auth_challenge_may_be_modified(struct auth4_context *auth_ctx)
 {
        return auth_ctx->challenge.may_be_modified;
 }
@@ -54,7 +54,7 @@ _PUBLIC_ bool auth_challenge_may_be_modified(struct auth_context *auth_ctx)
  Try to get a challenge out of the various authentication modules.
  Returns a const char of length 8 bytes.
 ****************************************************************************/
-_PUBLIC_ NTSTATUS auth_get_challenge(struct auth_context *auth_ctx, uint8_t chal[8])
+_PUBLIC_ NTSTATUS auth_get_challenge(struct auth4_context *auth_ctx, uint8_t chal[8])
 {
        NTSTATUS nt_status;
        struct auth_method_context *method;
@@ -104,7 +104,7 @@ PAC isn't available, and for tokenGroups in the DSDB stack.
  Supply either a principal or a DN
 ****************************************************************************/
 _PUBLIC_ NTSTATUS auth_get_user_info_dc_principal(TALLOC_CTX *mem_ctx,
-                                                struct auth_context *auth_ctx,
+                                                struct auth4_context *auth_ctx,
                                                 const char *principal,
                                                 struct ldb_dn *user_dn,
                                                 struct auth_user_info_dc **user_info_dc)
@@ -155,7 +155,7 @@ _PUBLIC_ NTSTATUS auth_get_user_info_dc_principal(TALLOC_CTX *mem_ctx,
  *
  **/
 
-_PUBLIC_ NTSTATUS auth_check_password(struct auth_context *auth_ctx,
+_PUBLIC_ NTSTATUS auth_check_password(struct auth4_context *auth_ctx,
                             TALLOC_CTX *mem_ctx,
                             const struct auth_usersupplied_info *user_info, 
                             struct auth_user_info_dc **user_info_dc)
@@ -188,7 +188,7 @@ _PUBLIC_ NTSTATUS auth_check_password(struct auth_context *auth_ctx,
 }
 
 struct auth_check_password_state {
-       struct auth_context *auth_ctx;
+       struct auth4_context *auth_ctx;
        const struct auth_usersupplied_info *user_info;
        struct auth_user_info_dc *user_info_dc;
        struct auth_method_context *method;
@@ -225,7 +225,7 @@ static void auth_check_password_async_trigger(struct tevent_context *ev,
 
 _PUBLIC_ struct tevent_req *auth_check_password_send(TALLOC_CTX *mem_ctx,
                                struct tevent_context *ev,
-                               struct auth_context *auth_ctx,
+                               struct auth4_context *auth_ctx,
                                const struct auth_usersupplied_info *user_info)
 {
        struct tevent_req *req;
@@ -409,7 +409,7 @@ _PUBLIC_ NTSTATUS auth_check_password_recv(struct tevent_req *req,
 /* Wrapper because we don't want to expose all callers to needing to
  * know that session_info is generated from the main ldb */
 static NTSTATUS auth_generate_session_info_wrapper(TALLOC_CTX *mem_ctx,
-                                                  struct auth_context *auth_context,
+                                                  struct auth4_context *auth_context,
                                                   struct auth_user_info_dc *user_info_dc,
                                                   uint32_t session_info_flags,
                                                   struct auth_session_info **session_info)
@@ -428,10 +428,10 @@ _PUBLIC_ NTSTATUS auth_context_create_methods(TALLOC_CTX *mem_ctx, const char **
                                              struct imessaging_context *msg,
                                              struct loadparm_context *lp_ctx,
                                              struct ldb_context *sam_ctx,
-                                             struct auth_context **auth_ctx)
+                                             struct auth4_context **auth_ctx)
 {
        int i;
-       struct auth_context *ctx;
+       struct auth4_context *ctx;
 
        auth4_init();
 
@@ -440,7 +440,7 @@ _PUBLIC_ NTSTATUS auth_context_create_methods(TALLOC_CTX *mem_ctx, const char **
                return NT_STATUS_INTERNAL_ERROR;
        }
 
-       ctx = talloc(mem_ctx, struct auth_context);
+       ctx = talloc(mem_ctx, struct auth4_context);
        NT_STATUS_HAVE_NO_MEMORY(ctx);
        ctx->challenge.set_by           = NULL;
        ctx->challenge.may_be_modified  = false;
@@ -510,7 +510,7 @@ _PUBLIC_ NTSTATUS auth_context_create(TALLOC_CTX *mem_ctx,
                             struct tevent_context *ev,
                             struct imessaging_context *msg,
                             struct loadparm_context *lp_ctx,
-                            struct auth_context **auth_ctx)
+                            struct auth4_context **auth_ctx)
 {
        NTSTATUS status;
        const char **auth_methods;
@@ -533,7 +533,7 @@ _PUBLIC_ NTSTATUS auth_context_create(TALLOC_CTX *mem_ctx,
    This allows us not to re-open the LDB when we need to do a some authentication logic (such as tokenGroups)
 
  */
-NTSTATUS auth_context_create_from_ldb(TALLOC_CTX *mem_ctx, struct ldb_context *ldb, struct auth_context **auth_ctx)
+NTSTATUS auth_context_create_from_ldb(TALLOC_CTX *mem_ctx, struct ldb_context *ldb, struct auth4_context **auth_ctx)
 {
        NTSTATUS status;
        const char **auth_methods;
@@ -620,10 +620,10 @@ const struct auth_operations *auth_backend_byname(const char *name)
 const struct auth_critical_sizes *auth_interface_version(void)
 {
        static const struct auth_critical_sizes critical_sizes = {
-               AUTH_INTERFACE_VERSION,
+               AUTH4_INTERFACE_VERSION,
                sizeof(struct auth_operations),
                sizeof(struct auth_method_context),
-               sizeof(struct auth_context),
+               sizeof(struct auth4_context),
                sizeof(struct auth_usersupplied_info),
                sizeof(struct auth_user_info_dc)
        };

diff --git a/source4/auth/ntlm/auth_anonymous.c b/source4/auth/ntlm/auth_anonymous.c
index 6b21225aadf4bb24281b8c82c62827776122ebf9..4b0fff03ccc2ab1b0e1896cde9a68186da337cae 100644 (file)
--- a/source4/auth/ntlm/auth_anonymous.c
+++ b/source4/auth/ntlm/auth_anonymous.c
@@ -24,7 +24,7 @@
 #include "auth/ntlm/auth_proto.h"
 #include "param/param.h"
 
-_PUBLIC_ NTSTATUS auth_anonymous_init(void);
+_PUBLIC_ NTSTATUS auth4_anonymous_init(void);
 
 /**
  * Return a anonymous logon for anonymous users (username = "")
@@ -66,7 +66,7 @@ static const struct auth_operations anonymous_auth_ops = {
        .check_password = anonymous_check_password
 };
 
-_PUBLIC_ NTSTATUS auth_anonymous_init(void)
+_PUBLIC_ NTSTATUS auth4_anonymous_init(void)
 {
        NTSTATUS ret;
 

diff --git a/source4/auth/ntlm/auth_developer.c b/source4/auth/ntlm/auth_developer.c
index da842c98baf4bbab936952bc47ffec7cee7eb999..bc27f27fa284bd4e7439785110d5d1be31876c6a 100644 (file)
--- a/source4/auth/ntlm/auth_developer.c
+++ b/source4/auth/ntlm/auth_developer.c
@@ -24,7 +24,7 @@
 #include "auth/ntlm/auth_proto.h"
 #include "libcli/security/security.h"
 
-_PUBLIC_ NTSTATUS auth_developer_init(void);
+_PUBLIC_ NTSTATUS auth4_developer_init(void);
 
 static NTSTATUS name_to_ntstatus_want_check(struct auth_method_context *ctx,
                                            TALLOC_CTX *mem_ctx,
@@ -185,7 +185,7 @@ static const struct auth_operations fixed_challenge_auth_ops = {
        .check_password = fixed_challenge_check_password
 };
 
-_PUBLIC_ NTSTATUS auth_developer_init(void)
+_PUBLIC_ NTSTATUS auth4_developer_init(void)
 {
        NTSTATUS ret;
 

diff --git a/source4/auth/ntlm/auth_sam.c b/source4/auth/ntlm/auth_sam.c
index f76057a6df1d793a549b6f32477c124c972aa507..87a7d275596c7a829d197cfb769f614644ed13ba 100644 (file)
--- a/source4/auth/ntlm/auth_sam.c
+++ b/source4/auth/ntlm/auth_sam.c
@@ -72,7 +72,7 @@ static NTSTATUS authsam_search_account(TALLOC_CTX *mem_ctx, struct ldb_context *
  Do a specific test for an smb password being correct, given a smb_password and
  the lanman and NT responses.
 ****************************************************************************/
-static NTSTATUS authsam_password_ok(struct auth_context *auth_context,
+static NTSTATUS authsam_password_ok(struct auth4_context *auth_context,
                                    TALLOC_CTX *mem_ctx,
                                    uint16_t acct_flags,
                                    const struct samr_Password *lm_pwd, 
@@ -142,7 +142,7 @@ static NTSTATUS authsam_password_ok(struct auth_context *auth_context,
   send a message to the drepl server telling it to initiate a
   REPL_SECRET getncchanges extended op to fetch the users secrets
  */
-static void auth_sam_trigger_repl_secret(TALLOC_CTX *mem_ctx, struct auth_context *auth_context,
+static void auth_sam_trigger_repl_secret(TALLOC_CTX *mem_ctx, struct auth4_context *auth_context,
                                         struct ldb_dn *user_dn)
 {
        struct dcerpc_binding_handle *irpc_handle;
@@ -170,7 +170,7 @@ static void auth_sam_trigger_repl_secret(TALLOC_CTX *mem_ctx, struct auth_contex
 }
 
 
-static NTSTATUS authsam_authenticate(struct auth_context *auth_context, 
+static NTSTATUS authsam_authenticate(struct auth4_context *auth_context, 
                                     TALLOC_CTX *mem_ctx, struct ldb_context *sam_ctx, 
                                     struct ldb_dn *domain_dn,
                                     struct ldb_message *msg,
@@ -357,7 +357,7 @@ static NTSTATUS authsam_want_check(struct auth_method_context *ctx,
                                   
 /* Wrapper for the auth subsystem pointer */
 static NTSTATUS authsam_get_user_info_dc_principal_wrapper(TALLOC_CTX *mem_ctx,
-                                                         struct auth_context *auth_context,
+                                                         struct auth4_context *auth_context,
                                                          const char *principal,
                                                          struct ldb_dn *user_dn,
                                                          struct auth_user_info_dc **user_info_dc)
@@ -381,7 +381,7 @@ static const struct auth_operations sam_ops = {
        .get_user_info_dc_principal = authsam_get_user_info_dc_principal_wrapper
 };
 
-_PUBLIC_ NTSTATUS auth_sam_init(void)
+_PUBLIC_ NTSTATUS auth4_sam_init(void)
 {
        NTSTATUS ret;
 

diff --git a/source4/auth/ntlm/auth_server.c b/source4/auth/ntlm/auth_server.c
index 7efeb9242ade938a37e2db69f416de489e337843..9e1ceae0ca8217b78c4ef3c88b0e73c40c250082 100644 (file)
--- a/source4/auth/ntlm/auth_server.c
+++ b/source4/auth/ntlm/auth_server.c
@@ -27,7 +27,7 @@
 #include "param/param.h"
 #include "libcli/resolve/resolve.h"
 
-_PUBLIC_ NTSTATUS auth_server_init(void);
+_PUBLIC_ NTSTATUS auth4_server_init(void);
 
 /* This version of 'security=server' rewirtten from scratch for Samba4
  * libraries in 2008 */
@@ -223,7 +223,7 @@ static const struct auth_operations server_auth_ops = {
        .check_password = server_check_password
 };
 
-_PUBLIC_ NTSTATUS auth_server_init(void)
+_PUBLIC_ NTSTATUS auth4_server_init(void)
 {
        NTSTATUS ret;
 

diff --git a/source4/auth/ntlm/auth_simple.c b/source4/auth/ntlm/auth_simple.c
index 5f86466db906ac4d208d60ec43a940cc03d2547d..241906e2814bef0966af8acee6c60aa9fba10b2f 100644 (file)
--- a/source4/auth/ntlm/auth_simple.c
+++ b/source4/auth/ntlm/auth_simple.c
@@ -38,7 +38,7 @@ _PUBLIC_ NTSTATUS authenticate_username_pw(TALLOC_CTX *mem_ctx,
                                           const uint32_t logon_parameters,
                                           struct auth_session_info **session_info) 
 {
-       struct auth_context *auth_context;
+       struct auth4_context *auth_context;
        struct auth_usersupplied_info *user_info;
        struct auth_user_info_dc *user_info_dc;
        NTSTATUS nt_status;

diff --git a/source4/auth/ntlm/auth_unix.c b/source4/auth/ntlm/auth_unix.c
index 7fdb4b3ae07da2f3d6c02b47621540d7ed891cc5..9e92a04712b4200dfd93ac508c02d7eb9527f342 100644 (file)
--- a/source4/auth/ntlm/auth_unix.c
+++ b/source4/auth/ntlm/auth_unix.c
@@ -28,7 +28,7 @@
 #include "../libcli/auth/pam_errors.h"
 #include "param/param.h"
 
-_PUBLIC_ NTSTATUS auth_unix_init(void);
+_PUBLIC_ NTSTATUS auth4_unix_init(void);
 
 /* TODO: look at how to best fill in parms retrieveing a struct passwd info
  * except in case USER_INFO_DONT_CHECK_UNIX_ACCOUNT is set
@@ -804,7 +804,7 @@ static const struct auth_operations unix_ops = {
        .check_password = authunix_check_password
 };
 
-_PUBLIC_ NTSTATUS auth_unix_init(void)
+_PUBLIC_ NTSTATUS auth4_unix_init(void)
 {
        NTSTATUS ret;
 

diff --git a/source4/auth/ntlm/auth_util.c b/source4/auth/ntlm/auth_util.c
index 17bfa321673abc445f1832b06f4fa0a546e5d8ad..c19b5cfd42f9d206425b7c4cfa65f70b3baaa647 100644 (file)
--- a/source4/auth/ntlm/auth_util.c
+++ b/source4/auth/ntlm/auth_util.c
@@ -99,7 +99,7 @@ NTSTATUS map_user_info(TALLOC_CTX *mem_ctx,
  Create an auth_usersupplied_data structure after appropriate mapping.
 ****************************************************************************/
 
-NTSTATUS encrypt_user_info(TALLOC_CTX *mem_ctx, struct auth_context *auth_context, 
+NTSTATUS encrypt_user_info(TALLOC_CTX *mem_ctx, struct auth4_context *auth_context, 
                           enum auth_password_state to_state,
                           const struct auth_usersupplied_info *user_info_in,
                           const struct auth_usersupplied_info **user_info_encrypted)

diff --git a/source4/auth/ntlm/auth_winbind.c b/source4/auth/ntlm/auth_winbind.c
index dfb8fce2a6b10bdc9c3be90ff81446f9fe6ee31b..da152e718a85ab63caaa9657c76a680a7c9b2df4 100644 (file)
--- a/source4/auth/ntlm/auth_winbind.c
+++ b/source4/auth/ntlm/auth_winbind.c
@@ -31,7 +31,7 @@
 #include "nsswitch/libwbclient/wbclient.h"
 #include "libcli/security/security.h"
 
-_PUBLIC_ NTSTATUS auth_winbind_init(void);
+_PUBLIC_ NTSTATUS auth4_winbind_init(void);
 
 static NTSTATUS get_info3_from_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
                                               struct wbcAuthUserInfo *info,
@@ -324,7 +324,7 @@ static const struct auth_operations winbind_wbclient_ops = {
        .check_password = winbind_check_password_wbclient
 };
 
-_PUBLIC_ NTSTATUS auth_winbind_init(void)
+_PUBLIC_ NTSTATUS auth4_winbind_init(void)
 {
        NTSTATUS ret;
 

diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index 2ac2773c8542b11880a4bda923be57289ba88fea..d954ec008612a18aaa1a8e840136f79e7b49dd0d 100644 (file)
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_MODULE('auth4_sam_module',
        source='auth_sam.c',
        subsystem='auth4',
-       init_function='auth_sam_init',
+       init_function='auth4_sam_init',
        deps='samdb auth4_sam NTLMSSP_COMMON samba-hostconfig'
        )
 
@@ -11,7 +11,7 @@ bld.SAMBA_MODULE('auth4_sam_module',
 bld.SAMBA_MODULE('auth4_anonymous',
        source='auth_anonymous.c',
        subsystem='auth4',
-       init_function='auth_anonymous_init',
+       init_function='auth4_anonymous_init',
        deps='talloc'
        )
 
@@ -19,7 +19,7 @@ bld.SAMBA_MODULE('auth4_anonymous',
 bld.SAMBA_MODULE('auth4_server',
        source='auth_server.c',
        subsystem='auth4',
-       init_function='auth_server_init',
+       init_function='auth4_server_init',
        deps='samba-util LIBCLI_SMB CREDENTIALS_NTLM'
        )
 
@@ -27,7 +27,7 @@ bld.SAMBA_MODULE('auth4_server',
 bld.SAMBA_MODULE('auth4_winbind',
        source='auth_winbind.c',
        subsystem='auth4',
-       init_function='auth_winbind_init',
+       init_function='auth4_winbind_init',
        deps='RPC_NDR_WINBIND MESSAGING wbclient'
        )
 
@@ -35,7 +35,7 @@ bld.SAMBA_MODULE('auth4_winbind',
 bld.SAMBA_MODULE('auth4_developer',
        source='auth_developer.c',
        subsystem='auth4',
-       init_function='auth_developer_init',
+       init_function='auth4_developer_init',
        deps='talloc'
        )
 
@@ -43,7 +43,7 @@ bld.SAMBA_MODULE('auth4_developer',
 bld.SAMBA_MODULE('auth4_unix',
        source='auth_unix.c',
        subsystem='auth4',
-       init_function='auth_unix_init',
+       init_function='auth4_unix_init',
        deps='pam PAM_ERRORS LIBTSOCKET'
        )
 

diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h
index ff30317f553f401a420ec40121cd704f64e98c18..00439e68dd7c0535e6ba58681eb4b7a34b1c2e6c 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp.h
+++ b/source4/auth/ntlmssp/ntlmssp.h
@@ -26,7 +26,7 @@
 struct gensec_ntlmssp_context {
        struct gensec_security *gensec_security;
        struct ntlmssp_state *ntlmssp_state;
-       struct auth_context *auth_context;
+       struct auth4_context *auth_context;
        struct auth_user_info_dc *user_info_dc;
 };
 

diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index cdae37262e54741e86c30cf9c8e197c03e37d3f9..56315c5966534c8ea9fdb7e928641bae747f6cc9 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -88,7 +88,7 @@ static NTSTATUS auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlmssp_s
        struct gensec_ntlmssp_context *gensec_ntlmssp =
                talloc_get_type_abort(ntlmssp_state->callback_private,
                                      struct gensec_ntlmssp_context);
-       struct auth_context *auth_context = gensec_ntlmssp->auth_context;
+       struct auth4_context *auth_context = gensec_ntlmssp->auth_context;
        NTSTATUS status;
 
        status = auth_context->get_challenge(auth_context, chal);
@@ -111,7 +111,7 @@ static bool auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_s
        struct gensec_ntlmssp_context *gensec_ntlmssp =
                talloc_get_type_abort(ntlmssp_state->callback_private,
                                      struct gensec_ntlmssp_context);
-       struct auth_context *auth_context = gensec_ntlmssp->auth_context;
+       struct auth4_context *auth_context = gensec_ntlmssp->auth_context;
 
        return auth_context->challenge_may_be_modified(auth_context);
 }
@@ -125,7 +125,7 @@ static NTSTATUS auth_ntlmssp_set_challenge(struct ntlmssp_state *ntlmssp_state,
        struct gensec_ntlmssp_context *gensec_ntlmssp =
                talloc_get_type_abort(ntlmssp_state->callback_private,
                                      struct gensec_ntlmssp_context);
-       struct auth_context *auth_context = gensec_ntlmssp->auth_context;
+       struct auth4_context *auth_context = gensec_ntlmssp->auth_context;
        NTSTATUS nt_status;
        const uint8_t *chal;
 
@@ -155,7 +155,7 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state,
        struct gensec_ntlmssp_context *gensec_ntlmssp =
                talloc_get_type_abort(ntlmssp_state->callback_private,
                                      struct gensec_ntlmssp_context);
-       struct auth_context *auth_context = gensec_ntlmssp->auth_context;
+       struct auth4_context *auth_context = gensec_ntlmssp->auth_context;
        NTSTATUS nt_status;
        struct auth_usersupplied_info *user_info;
 

diff --git a/source4/auth/pyauth.c b/source4/auth/pyauth.c
index 6fd68d2070565197822ebd3afaff2767430fcd20..6b3948970f060fb07eb8712a7619dfb6a4d651e0 100644 (file)
--- a/source4/auth/pyauth.c
+++ b/source4/auth/pyauth.c
@@ -205,7 +205,7 @@ static const char **PyList_AsStringList(TALLOC_CTX *mem_ctx, PyObject *list,
        return ret;
 }
 
-static PyObject *PyAuthContext_FromContext(struct auth_context *auth_context)
+static PyObject *PyAuthContext_FromContext(struct auth4_context *auth_context)
 {
        return py_talloc_reference(&PyAuthContext, auth_context);
 }
@@ -218,7 +218,7 @@ static PyObject *py_auth_context_new(PyTypeObject *type, PyObject *args, PyObjec
        PyObject *py_auth_context = Py_None;
        PyObject *py_methods = Py_None;
        TALLOC_CTX *mem_ctx;
-       struct auth_context *auth_context;
+       struct auth4_context *auth_context;
        struct imessaging_context *imessaging_context = NULL;
        struct loadparm_context *lp_ctx;
        struct tevent_context *ev;

diff --git a/source4/auth/samba_server_gensec.c b/source4/auth/samba_server_gensec.c
index b1b86877085257d828bf839df647276872c0c855..24b658ad321fb0baa0b41cc127f40847cf1130e8 100644 (file)
--- a/source4/auth/samba_server_gensec.c
+++ b/source4/auth/samba_server_gensec.c
@@ -37,7 +37,7 @@ NTSTATUS samba_server_gensec_start(TALLOC_CTX *mem_ctx,
 { 
        NTSTATUS nt_status;
        struct gensec_security *gensec_ctx;
-       struct auth_context *auth_context;
+       struct auth4_context *auth_context;
 
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
        if (!tmp_ctx) {

diff --git a/source4/lib/events/events.h b/source4/lib/events/events.h
index f66698838d726b442db4624513e5527433202881..546a5e5158838573bfaf33407153c879b80e7602 100644 (file)
--- a/source4/lib/events/events.h
+++ b/source4/lib/events/events.h
@@ -1,6 +1,8 @@
 #ifndef __LIB_EVENTS_H__
 #define __LIB_EVENTS_H__
+#ifndef TEVENT_COMPAT_DEFINES
 #define TEVENT_COMPAT_DEFINES 1
+#endif
 #include <tevent.h>
 struct tevent_context *s4_event_context_init(TALLOC_CTX *mem_ctx);
 struct tevent_context *event_context_find(TALLOC_CTX *mem_ctx) _DEPRECATED_;

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index bf8b4844a0869770d117b8b3fb4e01291ed00c17..8964c1d2392a90f4aec491c6c8c40bc2924db88d 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -600,7 +600,7 @@ static NTSTATUS dcesrv_netr_LogonSamLogon_check(const struct netr_LogonSamLogonE
 static NTSTATUS dcesrv_netr_LogonSamLogon_base(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                        struct netr_LogonSamLogonEx *r, struct netlogon_creds_CredentialState *creds)
 {
-       struct auth_context *auth_context;
+       struct auth4_context *auth_context;
        struct auth_usersupplied_info *user_info;
        struct auth_user_info_dc *user_info_dc;
        NTSTATUS nt_status;

diff --git a/source4/smb_server/smb/sesssetup.c b/source4/smb_server/smb/sesssetup.c
index c4efe3919c39fed9beef3d06c25a3f1dbab4b559..116f2cd958473ff51773fb7811518655a343067f 100644 (file)
--- a/source4/smb_server/smb/sesssetup.c
+++ b/source4/smb_server/smb/sesssetup.c
@@ -34,7 +34,7 @@
 #include "lib/stream/packet.h"
 
 struct sesssetup_context {
-       struct auth_context *auth_context;
+       struct auth4_context *auth_context;
        struct smbsrv_request *req;
 };
 

diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index 6088853743bb941626bf5afc651e0fd33f799c1a..83612194fff4eed0f9e509df38e5baea3651ddb2 100644 (file)
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -300,7 +300,7 @@ struct smbsrv_connection {
                enum protocol_types protocol;
 
                /* authentication context for multi-part negprot */
-               struct auth_context *auth_context;
+               struct auth4_context *auth_context;
        
                /* reference to the kerberos keytab, or machine trust account */
                struct cli_credentials *server_credentials;

diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index f905089248c4d7b19e42c4eb635ea26b29b1d322..24c57641f32ccdc4dc9ce13c2c29b443ffa9330b 100644 (file)
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -461,7 +461,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
                case SQUID_2_5_NTLMSSP:
                {
                        const char *winbind_method[] = { "winbind", NULL };
-                       struct auth_context *auth_context;
+                       struct auth4_context *auth_context;
 
                        msg = imessaging_client_init(state, lpcfg_imessaging_path(state, lp_ctx), ev);
                        if (!msg) {