dynconfig: Fix deps, no talloc required

[samba.git] / source3 / pam_smbpass / pam_smb_auth.c

diff --git a/source3/pam_smbpass/pam_smb_auth.c b/source3/pam_smbpass/pam_smb_auth.c
index feb469792d3756e264a150f6d2567e3972561601..06ab8455d5daa73aeceec5758b456ebd2f639f1f 100644 (file)
--- a/source3/pam_smbpass/pam_smb_auth.c
+++ b/source3/pam_smbpass/pam_smb_auth.c
@@ -18,7 +18,7 @@
 #define PAM_SM_AUTH
 
 #include "includes.h"
-#include "debug.h"
+#include "lib/util/debug.h"
 
 #ifndef LINUX
 
@@ -41,15 +41,23 @@
 
 #include "support.h"
 
+static void ret_data_cleanup(pam_handle_t *pamh, void *data, int error_status)
+{
+       free(data);
+}
+
 #define AUTH_RETURN                                            \
 do {                                                           \
        /* Restore application signal handler */                \
        CatchSignal(SIGPIPE, oldsig_handler);                   \
        if(ret_data) {                                          \
                *ret_data = retval;                             \
-               pam_set_data( pamh, "smb_setcred_return"        \
-                             , (void *) ret_data, NULL );      \
+               pam_set_data(pamh,                              \
+                       "smb_setcred_return",                   \
+                       (void *)ret_data,                       \
+                       ret_data_cleanup);                      \
        }                                                       \
+       TALLOC_FREE(frame);                                     \
        return retval;                                          \
 } while (0)
 
@@ -75,13 +83,12 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
        const char *name;
        void (*oldsig_handler)(int) = NULL;
        bool found;
+       TALLOC_CTX *frame = talloc_stackframe();
 
        /* Points to memory managed by the PAM library. Do not free. */
        char *p = NULL;
 
        /* Samba initialization. */
-       load_case_tables();
-        lp_set_in_client(True);
 
        ctrl = set_ctrl(pamh, flags, argc, argv);
 
@@ -196,6 +203,7 @@ static int _smb_add_user(pam_handle_t *pamh, unsigned int ctrl,
        char *msg_str = NULL;
        const char *pass = NULL;
        int retval;
+       TALLOC_CTX *frame = talloc_stackframe();
 
        /* Get the authtok; if we don't have one, silently fail. */
        retval = _pam_get_item( pamh, PAM_AUTHTOK, &pass );
@@ -203,8 +211,7 @@ static int _smb_add_user(pam_handle_t *pamh, unsigned int ctrl,
        if (retval != PAM_SUCCESS) {
                _log_err(pamh, LOG_ALERT
                        , "pam_get_item returned error to pam_sm_authenticate" );
-               return PAM_AUTHTOK_RECOVER_ERR;
-       } else if (pass == NULL) {
+               TALLOC_FREE(frame);
                return PAM_AUTHTOK_RECOVER_ERR;
        }
 
@@ -221,6 +228,7 @@ static int _smb_add_user(pam_handle_t *pamh, unsigned int ctrl,
 
                SAFE_FREE(err_str);
                SAFE_FREE(msg_str);
+               TALLOC_FREE(frame);
                return PAM_IGNORE;
        } else {
                /* mimick 'update encrypted' as long as the 'no pw req' flag is not set */
@@ -238,6 +246,7 @@ static int _smb_add_user(pam_handle_t *pamh, unsigned int ctrl,
        SAFE_FREE(err_str);
        SAFE_FREE(msg_str);
        pass = NULL;
+       TALLOC_FREE(frame);
        return PAM_IGNORE;
 }