[Pkg-samba-maint] r2807 - in branches/samba/experimental/debian: . patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Thu Jun 4 20:23:23 UTC 2009
Author: bubulle
Date: 2009-06-04 20:23:22 +0000 (Thu, 04 Jun 2009)
New Revision: 2807
Removed:
branches/samba/experimental/debian/patches/non-linux-ports.patch
branches/samba/experimental/debian/patches/smbclient-link.patch
branches/samba/experimental/debian/patches/smbpasswd-syslog.patch
Modified:
branches/samba/experimental/debian/changelog
branches/samba/experimental/debian/patches/series
Log:
New upstream version: 3 patches dropped
Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog 2009-06-03 18:15:49 UTC (rev 2806)
+++ branches/samba/experimental/debian/changelog 2009-06-04 20:23:22 UTC (rev 2807)
@@ -1,8 +1,15 @@
-samba (2:3.4.0~pre1-2) UNRELEASED; urgency=low
+samba (2:3.4.0~pre2-1) UNRELEASED; urgency=low
+ [ Jelmer Vernooij ]
* Split binaries out of samba-common into samba-common-bin. Closes:
#524661
+ [ Christian Perrier ]
+ * New upstream version
+ * Drop non-linux-ports.patch that was integrated upstream
+ * Drop smbpasswd-syslog.patch that was integrated upstream
+ * Drop smbclient-link.patch that was integrated upstream
+
-- Jelmer Vernooij <jelmer at debian.org> Tue, 02 Jun 2009 14:07:37 +0200
samba (2:3.4.0~pre1-1) experimental; urgency=low
Deleted: branches/samba/experimental/debian/patches/non-linux-ports.patch
===================================================================
--- branches/samba/experimental/debian/patches/non-linux-ports.patch 2009-06-03 18:15:49 UTC (rev 2806)
+++ branches/samba/experimental/debian/patches/non-linux-ports.patch 2009-06-04 20:23:22 UTC (rev 2807)
@@ -1,73 +0,0 @@
-Goal: Support non Linux ports
-
-Fixes: 266693
-
-Status wrt upstream: Forwarded, will be in 3.0.26
-
-Note: Upstream would probably welcome patches allowing to build on new architectures.
- As this patch is the most often broken by new upstream releases, everybody would benefit from it.
-
-Index: samba-3.4.0pre1/source3/configure.in
-===================================================================
---- samba-3.4.0pre1.orig/source3/configure.in
-+++ samba-3.4.0pre1/source3/configure.in
-@@ -579,6 +579,15 @@
- fi
- ;;
-
-+# Systems with LFS support.
-+#
-+ gnu* | k*bsd*-gnu)
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-+ AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
-+ AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
-+ AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions])
-+ ;;
-+
- # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
- #
- *linux*)
-@@ -1241,7 +1250,7 @@
- #
- #
- case "$host_os" in
-- *linux*)
-+ linux*-gnu* | gnu* | k*bsd*-gnu)
- # glibc <= 2.3.2 has a broken getgrouplist
- AC_TRY_RUN([
- #include <unistd.h>
-@@ -1540,7 +1549,10 @@
-
- # and these are for particular systems
- case "$host_os" in
-- *linux*) AC_DEFINE(LINUX,1,[Whether the host os is linux])
-+ linux*-gnu* | gnu* | k*bsd*-gnu)
-+ case "$host_os" in linux*)
-+ AC_DEFINE(LINUX,1,[Whether the host os is linux]) ;;
-+ esac
- BLDSHARED="true"
- if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
- LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -5387,7 +5399,7 @@
- AC_MSG_RESULT(yes);
-
- case "$host_os" in
-- *linux*)
-+ linux*-gnu* | gnu* | k*bsd*-gnu)
- AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
- AC_TRY_LINK([#include <sys/sendfile.h>],
- [\
-@@ -5748,11 +5760,11 @@
- WINBIND_NSS_PTHREAD=""
-
- case "$host_os" in
-- *linux*)
-+ linux*-gnu* | gnu* | k*bsd*-gnu)
- NSSSONAMEVERSIONSUFFIX=".2"
- WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
- ;;
-- *freebsd[[5-9]]*)
-+ freebsd5*|*freebsd[[6-9]]*)
- # FreeBSD winbind client is implemented as a wrapper around
- # the Linux version.
- NSSSONAMEVERSIONSUFFIX=".1"
Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series 2009-06-03 18:15:49 UTC (rev 2806)
+++ branches/samba/experimental/debian/patches/series 2009-06-04 20:23:22 UTC (rev 2807)
@@ -1,7 +1,6 @@
documentation.patch
fhs-filespaths.patch
installswat.sh.patch
-non-linux-ports.patch
pam-examples.patch
README_nosmbldap-tools.patch
smbclient-pager.patch
@@ -9,11 +8,9 @@
VERSION.patch
adapt_machine_creation_script.patch
autoconf.patch
-smbpasswd-syslog.patch
usershare.patch
swat-de.patch
smbtar-bashism.patch
no-unnecessary-cups.patch
fix-manpages-warnings.patch
-smbclient-link.patch
codepages-location.patch
Deleted: branches/samba/experimental/debian/patches/smbclient-link.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbclient-link.patch 2009-06-03 18:15:49 UTC (rev 2806)
+++ branches/samba/experimental/debian/patches/smbclient-link.patch 2009-06-04 20:23:22 UTC (rev 2807)
@@ -1,21 +0,0 @@
-Goal: Add missing link with libz
-
-Fixes: Build failure..:-)
-
-Status wrt upstream: Should be forwarded
-
-Note:
-
-Index: samba-3.4.0pre1/source3/Makefile.in
-===================================================================
---- samba-3.4.0pre1.orig/source3/Makefile.in
-+++ samba-3.4.0pre1/source3/Makefile.in
-@@ -2124,7 +2124,7 @@
- @echo Linking shared library $@
- @$(SHLD_DSO) -Wl,-z,defs $(LIBSMBCLIENT_OBJ) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
-- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-+ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \
- @SONAMEFLAG@`basename $@`
-
- $(LIBSMBCLIENT_SHARED_TARGET): $(LIBSMBCLIENT_SHARED_TARGET_SONAME)
Deleted: branches/samba/experimental/debian/patches/smbpasswd-syslog.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbpasswd-syslog.patch 2009-06-03 18:15:49 UTC (rev 2806)
+++ branches/samba/experimental/debian/patches/smbpasswd-syslog.patch 2009-06-04 20:23:22 UTC (rev 2807)
@@ -1,589 +0,0 @@
-Goal: Don't call openlog() or closelog() from pam_smbpass
-
-Fixes: bug #434372
-
-Upstream status: submitted as bugzilla bug #4831
-
-Index: samba-3.3.0rc2/source3/pam_smbpass/support.c
-===================================================================
---- samba-3.3.0rc2.orig/source3/pam_smbpass/support.c
-+++ samba-3.3.0rc2/source3/pam_smbpass/support.c
-@@ -14,6 +14,7 @@
- * this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-+#include "config.h"
- #include "includes.h"
- #include "general.h"
-
-@@ -62,17 +63,42 @@
- char *_pam_delete(register char *);
-
- /* syslogging function for errors and other information */
--
--void _log_err( int err, const char *format, ... )
-+#ifdef HAVE_PAM_VSYSLOG
-+void _log_err( pam_handle_t *pamh, int err, const char *format, ... )
- {
-- va_list args;
-+ va_list args;
-+
-+ va_start(args, format);
-+ pam_vsyslog(pamh, err, format, args);
-+ va_end(args);
-+}
-+#else
-+void _log_err( pam_handle_t *pamh, int err, const char *format, ... )
-+{
-+ va_list args;
-+ const char tag[] = "(pam_smbpass) ";
-+ char *mod_format;
-+
-+ mod_format = SMB_MALLOC_ARRAY(char, sizeof(tag) + strlen(format));
-+ /* try really, really hard to log something, since this may have
-+ been a message about a malloc() failure... */
-+ if (mod_format == NULL) {
-+ va_start(args, format);
-+ vsyslog(err | LOG_AUTH, format, args);
-+ va_end(args);
-+ return;
-+ }
-+
-+ strncpy(mod_format, tag, strlen(tag)+1);
-+ strncat(mod_format, format, strlen(format));
-+
-+ va_start(args, format);
-+ vsyslog(err | LOG_AUTH, mod_format, args);
-+ va_end(args);
-
-- va_start( args, format );
-- openlog( "PAM_smbpass", LOG_CONS | LOG_PID, LOG_AUTH );
-- vsyslog( err, format, args );
-- va_end( args );
-- closelog();
-+ free(mod_format);
- }
-+#endif
-
- /* this is a front-end for module-application conversations */
-
-@@ -90,11 +116,11 @@
- ,response, conv->appdata_ptr);
-
- if (retval != PAM_SUCCESS && on(SMB_DEBUG, ctrl)) {
-- _log_err(LOG_DEBUG, "conversation failure [%s]"
-+ _log_err(pamh, LOG_DEBUG, "conversation failure [%s]"
- ,pam_strerror(pamh, retval));
- }
- } else {
-- _log_err(LOG_ERR, "couldn't obtain coversation function [%s]"
-+ _log_err(pamh, LOG_ERR, "couldn't obtain coversation function [%s]"
- ,pam_strerror(pamh, retval));
- }
-
-@@ -121,7 +147,7 @@
-
- /* set the control flags for the SMB module. */
-
--int set_ctrl( int flags, int argc, const char **argv )
-+int set_ctrl( pam_handle_t *pamh, int flags, int argc, const char **argv )
- {
- int i = 0;
- const char *service_file = NULL;
-@@ -163,7 +189,7 @@
- /* Read some options from the Samba config. Can be overridden by
- the PAM config. */
- if(lp_load(service_file,True,False,False,True) == False) {
-- _log_err( LOG_ERR, "Error loading service file %s", service_file );
-+ _log_err(pamh, LOG_ERR, "Error loading service file %s", service_file);
- }
-
- secrets_init();
-@@ -186,7 +212,7 @@
- }
-
- if (j >= SMB_CTRLS_) {
-- _log_err( LOG_ERR, "unrecognized option [%s]", *argv );
-+ _log_err(pamh, LOG_ERR, "unrecognized option [%s]", *argv);
- } else {
- ctrl &= smb_args[j].mask; /* for turning things off */
- ctrl |= smb_args[j].flag; /* for turning things on */
-@@ -225,7 +251,7 @@
- * evidence of old token around for later stack analysis.
- *
- */
--char * smbpXstrDup( const char *x )
-+char * smbpXstrDup( pam_handle_t *pamh, const char *x )
- {
- register char *newstr = NULL;
-
-@@ -235,7 +261,7 @@
- for (i = 0; x[i]; ++i); /* length of string */
- if ((newstr = SMB_MALLOC_ARRAY(char, ++i)) == NULL) {
- i = 0;
-- _log_err( LOG_CRIT, "out of memory in smbpXstrDup" );
-+ _log_err(pamh, LOG_CRIT, "out of memory in smbpXstrDup");
- } else {
- while (i-- > 0) {
- newstr[i] = x[i];
-@@ -277,7 +303,7 @@
- /* log the number of authentication failures */
- if (failure->count != 0) {
- pam_get_item( pamh, PAM_SERVICE, (const void **) &service );
-- _log_err( LOG_NOTICE
-+ _log_err(pamh, LOG_NOTICE
- , "%d authentication %s "
- "from %s for service %s as %s(%d)"
- , failure->count
-@@ -286,7 +312,7 @@
- , service == NULL ? "**unknown**" : service
- , failure->user, failure->id );
- if (failure->count > SMB_MAX_RETRIES) {
-- _log_err( LOG_ALERT
-+ _log_err(pamh, LOG_ALERT
- , "service(%s) ignoring max retries; %d > %d"
- , service == NULL ? "**unknown**" : service
- , failure->count
-@@ -322,8 +348,7 @@
-
- if (!pdb_get_nt_passwd(sampass))
- {
-- _log_err( LOG_DEBUG, "user %s has null SMB password"
-- , name );
-+ _log_err(pamh, LOG_DEBUG, "user %s has null SMB password", name);
-
- if (off( SMB__NONULL, ctrl )
- && (pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ))
-@@ -333,7 +358,7 @@
- const char *service;
-
- pam_get_item( pamh, PAM_SERVICE, (const void **)&service );
-- _log_err( LOG_NOTICE, "failed auth request by %s for service %s as %s",
-+ _log_err(pamh, LOG_NOTICE, "failed auth request by %s for service %s as %s",
- uidtoname(getuid()), service ? service : "**unknown**", name);
- return PAM_AUTH_ERR;
- }
-@@ -341,7 +366,7 @@
-
- data_name = SMB_MALLOC_ARRAY(char, sizeof(FAIL_PREFIX) + strlen( name ));
- if (data_name == NULL) {
-- _log_err( LOG_CRIT, "no memory for data-name" );
-+ _log_err(pamh, LOG_CRIT, "no memory for data-name" );
- return PAM_AUTH_ERR;
- }
- strncpy( data_name, FAIL_PREFIX, sizeof(FAIL_PREFIX) );
-@@ -388,31 +413,31 @@
- retval = PAM_MAXTRIES;
- }
- } else {
-- _log_err(LOG_NOTICE,
-+ _log_err(pamh, LOG_NOTICE,
- "failed auth request by %s for service %s as %s",
- uidtoname(getuid()),
- service ? service : "**unknown**", name);
- newauth->count = 1;
- }
- if (!sid_to_uid(pdb_get_user_sid(sampass), &(newauth->id))) {
-- _log_err(LOG_NOTICE,
-+ _log_err(pamh, LOG_NOTICE,
- "failed auth request by %s for service %s as %s",
- uidtoname(getuid()),
- service ? service : "**unknown**", name);
- }
-- newauth->user = smbpXstrDup( name );
-- newauth->agent = smbpXstrDup( uidtoname( getuid() ) );
-+ newauth->user = smbpXstrDup( pamh, name );
-+ newauth->agent = smbpXstrDup( pamh, uidtoname( getuid() ) );
- pam_set_data( pamh, data_name, newauth, _cleanup_failures );
-
- } else {
-- _log_err( LOG_CRIT, "no memory for failure recorder" );
-- _log_err(LOG_NOTICE,
-+ _log_err(pamh, LOG_CRIT, "no memory for failure recorder" );
-+ _log_err(pamh, LOG_NOTICE,
- "failed auth request by %s for service %s as %s(%d)",
- uidtoname(getuid()),
- service ? service : "**unknown**", name);
- }
- }
-- _log_err(LOG_NOTICE,
-+ _log_err(pamh, LOG_NOTICE,
- "failed auth request by %s for service %s as %s(%d)",
- uidtoname(getuid()),
- service ? service : "**unknown**", name);
-@@ -488,8 +513,8 @@
- retval = pam_get_item( pamh, authtok_flag, (const void **) &item );
- if (retval != PAM_SUCCESS) {
- /* very strange. */
-- _log_err( LOG_ALERT
-- , "pam_get_item returned error to smb_read_password" );
-+ _log_err(pamh, LOG_ALERT,
-+ "pam_get_item returned error to smb_read_password");
- return retval;
- } else if (item != NULL) { /* we have a password! */
- *pass = item;
-@@ -541,7 +566,7 @@
-
- if (retval == PAM_SUCCESS) { /* a good conversation */
-
-- token = smbpXstrDup(resp[j++].resp);
-+ token = smbpXstrDup(pamh, resp[j++].resp);
- if (token != NULL) {
- if (expect == 2) {
- /* verify that password entered correctly */
-@@ -553,7 +578,8 @@
- }
- }
- } else {
-- _log_err(LOG_NOTICE, "could not recover authentication token");
-+ _log_err(pamh, LOG_NOTICE,
-+ "could not recover authentication token");
- }
- }
-
-@@ -566,7 +592,7 @@
-
- if (retval != PAM_SUCCESS) {
- if (on( SMB_DEBUG, ctrl ))
-- _log_err( LOG_DEBUG, "unable to obtain a password" );
-+ _log_err(pamh, LOG_DEBUG, "unable to obtain a password");
- return retval;
- }
- /* 'token' is the entered password */
-@@ -581,7 +607,7 @@
- || (retval = pam_get_item( pamh, authtok_flag
- ,(const void **)&item )) != PAM_SUCCESS)
- {
-- _log_err( LOG_CRIT, "error manipulating password" );
-+ _log_err(pamh, LOG_CRIT, "error manipulating password");
- return retval;
- }
- } else {
-@@ -595,8 +621,8 @@
- || (retval = pam_get_data( pamh, data_name, (const void **)&item ))
- != PAM_SUCCESS)
- {
-- _log_err( LOG_CRIT, "error manipulating password data [%s]"
-- , pam_strerror( pamh, retval ));
-+ _log_err(pamh, LOG_CRIT, "error manipulating password data [%s]",
-+ pam_strerror( pamh, retval ));
- _pam_delete( token );
- item = NULL;
- return retval;
-@@ -620,8 +646,8 @@
- if (pass_new == NULL || (pass_old && !strcmp( pass_old, pass_new )))
- {
- if (on(SMB_DEBUG, ctrl)) {
-- _log_err( LOG_DEBUG,
-- "passwd: bad authentication token (null or unchanged)" );
-+ _log_err(pamh, LOG_DEBUG,
-+ "passwd: bad authentication token (null or unchanged)");
- }
- make_remark( pamh, ctrl, PAM_ERROR_MSG, pass_new == NULL ?
- "No password supplied" : "Password unchanged" );
-Index: samba-3.3.0rc2/source3/pam_smbpass/pam_smb_auth.c
-===================================================================
---- samba-3.3.0rc2.orig/source3/pam_smbpass/pam_smb_auth.c
-+++ samba-3.3.0rc2/source3/pam_smbpass/pam_smb_auth.c
-@@ -81,10 +81,9 @@
-
- /* Samba initialization. */
- load_case_tables();
-- setup_logging("pam_smbpass",False);
- lp_set_in_client(True);
-
-- ctrl = set_ctrl(flags, argc, argv);
-+ ctrl = set_ctrl(pamh, flags, argc, argv);
-
- /* Get a few bytes so we can pass our return value to
- pam_sm_setcred(). */
-@@ -99,29 +98,29 @@
- retval = pam_get_user( pamh, &name, "Username: " );
- if ( retval != PAM_SUCCESS ) {
- if (on( SMB_DEBUG, ctrl )) {
-- _log_err(LOG_DEBUG, "auth: could not identify user");
-+ _log_err(pamh, LOG_DEBUG, "auth: could not identify user");
- }
- AUTH_RETURN;
- }
- if (on( SMB_DEBUG, ctrl )) {
-- _log_err( LOG_DEBUG, "username [%s] obtained", name );
-+ _log_err(pamh, LOG_DEBUG, "username [%s] obtained", name );
- }
-
- if (geteuid() != 0) {
-- _log_err( LOG_DEBUG, "Cannot access samba password database, not running as root.");
-+ _log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
- retval = PAM_AUTHINFO_UNAVAIL;
- AUTH_RETURN;
- }
-
- if (!initialize_password_db(True, NULL)) {
-- _log_err( LOG_ALERT, "Cannot access samba password database" );
-+ _log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
- retval = PAM_AUTHINFO_UNAVAIL;
- AUTH_RETURN;
- }
-
- sampass = samu_new( NULL );
- if (!sampass) {
-- _log_err( LOG_ALERT, "Cannot talloc a samu struct" );
-+ _log_err(pamh, LOG_ALERT, "Cannot talloc a samu struct" );
- retval = nt_status_to_pam(NT_STATUS_NO_MEMORY);
- AUTH_RETURN;
- }
-@@ -135,7 +134,7 @@
- }
-
- if (!found) {
-- _log_err(LOG_ALERT, "Failed to find entry for user %s.", name);
-+ _log_err(pamh, LOG_ALERT, "Failed to find entry for user %s.", name);
- retval = PAM_USER_UNKNOWN;
- TALLOC_FREE(sampass);
- sampass = NULL;
-@@ -154,7 +153,7 @@
-
- retval = _smb_read_password(pamh, ctrl, NULL, "Password: ", NULL, _SMB_AUTHTOK, &p);
- if (retval != PAM_SUCCESS ) {
-- _log_err(LOG_CRIT, "auth: no password provided for [%s]", name);
-+ _log_err(pamh,LOG_CRIT, "auth: no password provided for [%s]", name);
- TALLOC_FREE(sampass);
- AUTH_RETURN;
- }
-@@ -202,7 +201,7 @@
- retval = pam_get_item( pamh, PAM_AUTHTOK, (const void **) &pass );
-
- if (retval != PAM_SUCCESS) {
-- _log_err( LOG_ALERT
-+ _log_err(pamh, LOG_ALERT
- , "pam_get_item returned error to pam_sm_authenticate" );
- return PAM_AUTHTOK_RECOVER_ERR;
- } else if (pass == NULL) {
-Index: samba-3.3.0rc2/source3/pam_smbpass/pam_smb_acct.c
-===================================================================
---- samba-3.3.0rc2.orig/source3/pam_smbpass/pam_smb_acct.c
-+++ samba-3.3.0rc2/source3/pam_smbpass/pam_smb_acct.c
-@@ -58,26 +58,25 @@
-
- /* Samba initialization. */
- load_case_tables();
-- setup_logging( "pam_smbpass", False );
- lp_set_in_client(True);
-
-- ctrl = set_ctrl( flags, argc, argv );
-+ ctrl = set_ctrl(pamh, flags, argc, argv );
-
- /* get the username */
-
- retval = pam_get_user( pamh, &name, "Username: " );
- if (retval != PAM_SUCCESS) {
- if (on( SMB_DEBUG, ctrl )) {
-- _log_err( LOG_DEBUG, "acct: could not identify user" );
-+ _log_err(pamh, LOG_DEBUG, "acct: could not identify user" );
- }
- return retval;
- }
- if (on( SMB_DEBUG, ctrl )) {
-- _log_err( LOG_DEBUG, "acct: username [%s] obtained", name );
-+ _log_err(pamh, LOG_DEBUG, "acct: username [%s] obtained", name );
- }
-
- if (geteuid() != 0) {
-- _log_err( LOG_DEBUG, "Cannot access samba password database, not running as root.");
-+ _log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
- return PAM_AUTHINFO_UNAVAIL;
- }
-
-@@ -85,7 +84,7 @@
- from a SIGPIPE it's not expecting */
- oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
- if (!initialize_password_db(True, NULL)) {
-- _log_err( LOG_ALERT, "Cannot access samba password database" );
-+ _log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
- CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
- return PAM_AUTHINFO_UNAVAIL;
- }
-@@ -99,7 +98,7 @@
- }
-
- if (!pdb_getsampwnam(sampass, name )) {
-- _log_err( LOG_DEBUG, "acct: could not identify user" );
-+ _log_err(pamh, LOG_DEBUG, "acct: could not identify user");
- CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
- return PAM_USER_UNKNOWN;
- }
-@@ -112,8 +111,8 @@
-
- if (pdb_get_acct_ctrl(sampass) & ACB_DISABLED) {
- if (on( SMB_DEBUG, ctrl )) {
-- _log_err( LOG_DEBUG
-- , "acct: account %s is administratively disabled", name );
-+ _log_err(pamh, LOG_DEBUG,
-+ "acct: account %s is administratively disabled", name);
- }
- make_remark( pamh, ctrl, PAM_ERROR_MSG
- , "Your account has been disabled; "
-Index: samba-3.3.0rc2/source3/pam_smbpass/pam_smb_passwd.c
-===================================================================
---- samba-3.3.0rc2.orig/source3/pam_smbpass/pam_smb_passwd.c
-+++ samba-3.3.0rc2/source3/pam_smbpass/pam_smb_passwd.c
-@@ -106,10 +106,9 @@
-
- /* Samba initialization. */
- load_case_tables();
-- setup_logging( "pam_smbpass", False );
- lp_set_in_client(True);
-
-- ctrl = set_ctrl(flags, argc, argv);
-+ ctrl = set_ctrl(pamh, flags, argc, argv);
-
- /*
- * First get the name of a user. No need to do anything if we can't
-@@ -119,16 +118,16 @@
- retval = pam_get_user( pamh, &user, "Username: " );
- if (retval != PAM_SUCCESS) {
- if (on( SMB_DEBUG, ctrl )) {
-- _log_err( LOG_DEBUG, "password: could not identify user" );
-+ _log_err(pamh, LOG_DEBUG, "password: could not identify user");
- }
- return retval;
- }
- if (on( SMB_DEBUG, ctrl )) {
-- _log_err( LOG_DEBUG, "username [%s] obtained", user );
-+ _log_err(pamh, LOG_DEBUG, "username [%s] obtained", user);
- }
-
- if (geteuid() != 0) {
-- _log_err( LOG_DEBUG, "Cannot access samba password database, not running as root.");
-+ _log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
- return PAM_AUTHINFO_UNAVAIL;
- }
-
-@@ -137,7 +136,7 @@
- oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
-
- if (!initialize_password_db(False, NULL)) {
-- _log_err( LOG_ALERT, "Cannot access samba password database" );
-+ _log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
- CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
- return PAM_AUTHINFO_UNAVAIL;
- }
-@@ -149,12 +148,12 @@
- }
-
- if (!pdb_getsampwnam(sampass,user)) {
-- _log_err( LOG_ALERT, "Failed to find entry for user %s.", user );
-+ _log_err(pamh, LOG_ALERT, "Failed to find entry for user %s.", user);
- CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
- return PAM_USER_UNKNOWN;
- }
- if (on( SMB_DEBUG, ctrl )) {
-- _log_err( LOG_DEBUG, "Located account for %s", user );
-+ _log_err(pamh, LOG_DEBUG, "Located account for %s", user);
- }
-
- if (flags & PAM_PRELIM_CHECK) {
-@@ -180,7 +179,7 @@
- #define greeting "Changing password for "
- Announce = SMB_MALLOC_ARRAY(char, sizeof(greeting)+strlen(user));
- if (Announce == NULL) {
-- _log_err(LOG_CRIT, "password: out of memory");
-+ _log_err(pamh, LOG_CRIT, "password: out of memory");
- TALLOC_FREE(sampass);
- CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
- return PAM_BUF_ERR;
-@@ -195,8 +194,8 @@
- SAFE_FREE( Announce );
-
- if (retval != PAM_SUCCESS) {
-- _log_err( LOG_NOTICE
-- , "password - (old) token not obtained" );
-+ _log_err(pamh, LOG_NOTICE,
-+ "password - (old) token not obtained");
- TALLOC_FREE(sampass);
- CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
- return retval;
-@@ -241,7 +240,7 @@
- }
-
- if (retval != PAM_SUCCESS) {
-- _log_err( LOG_NOTICE, "password: user not authenticated" );
-+ _log_err(pamh, LOG_NOTICE, "password: user not authenticated");
- TALLOC_FREE(sampass);
- CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
- return retval;
-@@ -266,8 +265,8 @@
-
- if (retval != PAM_SUCCESS) {
- if (on( SMB_DEBUG, ctrl )) {
-- _log_err( LOG_ALERT
-- , "password: new password not obtained" );
-+ _log_err(pamh, LOG_ALERT,
-+ "password: new password not obtained");
- }
- pass_old = NULL; /* tidy up */
- TALLOC_FREE(sampass);
-@@ -288,7 +287,7 @@
- retval = _pam_smb_approve_pass(pamh, ctrl, pass_old, pass_new);
-
- if (retval != PAM_SUCCESS) {
-- _log_err(LOG_NOTICE, "new password not acceptable");
-+ _log_err(pamh, LOG_NOTICE, "new password not acceptable");
- pass_new = pass_old = NULL; /* tidy up */
- TALLOC_FREE(sampass);
- CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
-@@ -308,16 +307,17 @@
-
- /* password updated */
- if (!sid_to_uid(pdb_get_user_sid(sampass), &uid)) {
-- _log_err( LOG_NOTICE, "Unable to get uid for user %s",
-+ _log_err(pamh, LOG_NOTICE,
-+ "Unable to get uid for user %s",
- pdb_get_username(sampass));
-- _log_err( LOG_NOTICE, "password for (%s) changed by (%s/%d)",
-+ _log_err(pamh, LOG_NOTICE, "password for (%s) changed by (%s/%d)",
- user, uidtoname(getuid()), getuid());
- } else {
-- _log_err( LOG_NOTICE, "password for (%s/%d) changed by (%s/%d)",
-+ _log_err(pamh, LOG_NOTICE, "password for (%s/%d) changed by (%s/%d)",
- user, uid, uidtoname(getuid()), getuid());
- }
- } else {
-- _log_err( LOG_ERR, "password change failed for user %s", user);
-+ _log_err(pamh, LOG_ERR, "password change failed for user %s", user);
- }
-
- pass_old = pass_new = NULL;
-@@ -328,7 +328,7 @@
-
- } else { /* something has broken with the library */
-
-- _log_err( LOG_ALERT, "password received unknown request" );
-+ _log_err(pamh, LOG_ALERT, "password received unknown request");
- retval = PAM_ABORT;
-
- }
-Index: samba-3.3.0rc2/source3/pam_smbpass/support.h
-===================================================================
---- samba-3.3.0rc2.orig/source3/pam_smbpass/support.h
-+++ samba-3.3.0rc2/source3/pam_smbpass/support.h
-@@ -1,8 +1,8 @@
- /* syslogging function for errors and other information */
--extern void _log_err(int, const char *, ...);
-+extern void _log_err(pam_handle_t *, int, const char *, ...);
-
- /* set the control flags for the UNIX module. */
--extern int set_ctrl(int, int, const char **);
-+extern int set_ctrl(pam_handle_t *, int, int, const char **);
-
- /* generic function for freeing pam data segments */
- extern void _cleanup(pam_handle_t *, void *, int);
-@@ -12,7 +12,7 @@
- * evidence of old token around for later stack analysis.
- */
-
--extern char *smbpXstrDup(const char *);
-+extern char *smbpXstrDup(pam_handle_t *,const char *);
-
- /* ************************************************************** *
- * Useful non-trivial functions *
More information about the Pkg-samba-maint
mailing list