Samba 3.0.28a Available for Download

[Michael Adam]

Hi Alexander,

I have cheery-picked on of your commits (dc568fd52ae8ffaaaef2015c5a207ed9a58a9a7f)
to v3-0-test and also fixed on last forgotten caller of _log_err()
in d85c5b4d40a41d22b31d635023edbb31e719c97c.

So v3-0-test should be correct now.

Cheers - Michael


Alexander Bokovoy wrote:
> On Sun, Mar 9, 2008 at 2:42 PM, Thomas Bork <tombork at web.de> wrote:
> > Gerald (Jerry) Carter wrote:
> >
> >  > This is a bug fix release of the Samba 3.0.28 code base and
> >  > is the version that servers should be run for for all current
> >  > Samba 3.0 bug fixes.
> >
> >  [...]
> >  Compiling pam_smbpass/pam_smb_auth.c
> >  pam_smbpass/pam_smb_auth.c: In function `pam_sm_authenticate':
> >  pam_smbpass/pam_smb_auth.c:105: warning: passing arg 1 of `_log_err'
> >  makes integer from pointer without a cast
> >  pam_smbpass/pam_smb_auth.c:105: warning: passing arg 2 of `_log_err'
> >  makes pointer from integer without a cast
> >  Compiling pam_smbpass/pam_smb_passwd.c
> >  pam_smbpass/pam_smb_passwd.c: In function `pam_sm_chauthtok':
> >  pam_smbpass/pam_smb_passwd.c:129: warning: passing arg 1 of `_log_err'
> >  makes integer from pointer without a cast
> >  pam_smbpass/pam_smb_passwd.c:129: warning: passing arg 2 of `_log_err'
> >  makes pointer from integer without a cast
> >  Compiling pam_smbpass/pam_smb_acct.c
> >  pam_smbpass/pam_smb_acct.c: In function `pam_sm_acct_mgmt':
> >  pam_smbpass/pam_smb_acct.c:74: warning: passing arg 1 of `_log_err'
> >  makes integer from pointer without a cast
> >  pam_smbpass/pam_smb_acct.c:74: warning: passing arg 2 of `_log_err'
> >  makes pointer from integer without a cast
> >  [...]
> This is fixed in Samba 3.2. I think it is my fault -- I fixed the code
> in 3.2 but didn't backport to 3.0.
> (in samba-3-2-test)
> git diff HEAD..0723760ba47a465d2ff5a22a680f1b5196eca7d8 source/pam_smbpass/
> While looking at it I see that code in 3.0 a bit different and needs
> more fixes along the same line.
> -- 
> / Alexander Bokovoy

> diff --git a/source/pam_smbpass/pam_smb_acct.c b/source/pam_smbpass/pam_smb_acct.c
> index b9bcb31..59ed4ee 100644
> --- a/source/pam_smbpass/pam_smb_acct.c
> +++ b/source/pam_smbpass/pam_smb_acct.c
> @@ -78,7 +78,7 @@ int pam_sm_acct_mgmt( pam_handle_t *pamh, int flags,
>  	}
>  
>  	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;
>  	}
>  
> diff --git a/source/pam_smbpass/pam_smb_passwd.c b/source/pam_smbpass/pam_smb_passwd.c
> index 326a0b5..de53107 100644
> --- a/source/pam_smbpass/pam_smb_passwd.c
> +++ b/source/pam_smbpass/pam_smb_passwd.c
> @@ -130,7 +130,7 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
>      }
>  
>      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;
>      }
>  
> diff --git a/source/pam_smbpass/support.c b/source/pam_smbpass/support.c
> index bc9481d..9d56bd4 100644
> --- a/source/pam_smbpass/support.c
> +++ b/source/pam_smbpass/support.c
> @@ -61,6 +61,10 @@
>  	void _cleanup(pam_handle_t *, void *, int);
>  	char *_pam_delete(register char *);
>  
> +	/* default configuration file location */
> +
> +	const char *servicesf = get_dyn_CONFIGFILE();
> +
>  	/* syslogging function for errors and other information */
>  
>  	void _log_err( int err, const char *format, ... )
> @@ -124,7 +128,7 @@
>  int set_ctrl( int flags, int argc, const char **argv )
>  {
>      int i = 0;
> -    const char *service_file = NULL;
> +    const char *service_file = get_dyn_CONFIGFILE();
>      unsigned int ctrl;
>  
>      ctrl = SMB_DEFAULTS;	/* the default selection of options */
> @@ -135,7 +139,7 @@ int set_ctrl( int flags, int argc, const char **argv )
>      set( SMB__NONULL, ctrl );
>  
>      /* initialize service file location */
> -    service_file=get_dyn_CONFIGFILE();
> +    service_file=servicesf;
>  
>      if (flags & PAM_SILENT) {
>          set( SMB__QUIET, ctrl );

-- 
Michael Adam <ma at sernet.de>  <obnox at samba.org>
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.SerNet.DE, mailto: Info @ SerNet.DE
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 206 bytes
Desc: not available
Url : http://lists.samba.org/archive/samba-technical/attachments/20080310/60a4ff75/attachment.bin