s4-dns: dlz_bind9: Fix ipv6 updates

[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 88ff9851f5b1d803fa12b9d4d63d81354d4cf60b..ac5ef3f21c5156a0f028eb73f482e4668c72cb65 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
 
@@ -44,12 +44,13 @@
 #define AUTH_RETURN                                            \
 do {                                                           \
        /* Restore application signal handler */                \
-       CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);       \
+       CatchSignal(SIGPIPE, oldsig_handler);                   \
        if(ret_data) {                                          \
                *ret_data = retval;                             \
                pam_set_data( pamh, "smb_setcred_return"        \
                              , (void *) ret_data, NULL );      \
        }                                                       \
+       TALLOC_FREE(frame);                                     \
        return retval;                                          \
 } while (0)
 
@@ -75,13 +76,13 @@ 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);
+       load_case_tables_library();
 
        ctrl = set_ctrl(pamh, flags, argc, argv);
 
@@ -92,7 +93,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
        /* we need to do this before we call AUTH_RETURN */
        /* Getting into places that might use LDAP -- protect the app
        from a SIGPIPE it's not expecting */
-       oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
+       oldsig_handler = CatchSignal(SIGPIPE, SIG_IGN);
 
        /* get the username */
        retval = pam_get_user( pamh, &name, "Username: " );
@@ -196,6 +197,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 +205,10 @@ 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" );
+               TALLOC_FREE(frame);
                return PAM_AUTHTOK_RECOVER_ERR;
        } else if (pass == NULL) {
+               TALLOC_FREE(frame);
                return PAM_AUTHTOK_RECOVER_ERR;
        }
 
@@ -221,6 +225,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 +243,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;
 }