diff options
| author | Jeremy Allison <jra@samba.org> | 1998-11-10 00:37:14 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-11-10 00:37:14 +0000 |
| commit | 8c1625365479f12fa544d83e1a9f72a548398108 (patch) | |
| tree | cd6b236873675adf617d373ac1915e55c2960b32 /source | |
| parent | cb23417503dd2c3e8370757943daca78f3b598b6 (diff) | |
| download | samba-8c1625365479f12fa544d83e1a9f72a548398108.tar.gz | |
Default for SMB_PASSWD program was set to smbpasswd ! This explained the problems
John & Andrew were having with smbpasswd. This would cause the smbpasswd
to be changed *twice* - this the second decrypt would fail.
Changed it to be "/bin/passwd" and changed the name of the macro
to PASSWORD_PROGRAM to make it clear this is not an smb password
changer.
Jeremy.
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile.in | 4 | ||||
| -rw-r--r-- | source/param/loadparm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/Makefile.in b/source/Makefile.in index 253f7f2809f..ad5428e1e4a 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -40,7 +40,7 @@ NMBLOGFILE = $(VARDIR)/log.nmb CONFIGFILE = $(LIBDIR)/smb.conf LMHOSTSFILE = $(LIBDIR)/lmhosts DRIVERFILE = $(LIBDIR)/printers.def -SMB_PASSWD = $(BINDIR)/smbpasswd +PASSWD_PROGRAM = /bin/passwd SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd # This is where SWAT images and help files go @@ -63,7 +63,7 @@ CODEPAGELIST= 437 737 850 852 861 932 866 949 950 936 SMBRUN = $(BINDIR)/smbrun -PASSWD_FLAGS = -DSMB_PASSWD=\"$(SMB_PASSWD)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" +PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\" FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" diff --git a/source/param/loadparm.c b/source/param/loadparm.c index 74f8df6cb7c..bfc1b801e77 100644 --- a/source/param/loadparm.c +++ b/source/param/loadparm.c @@ -791,7 +791,7 @@ static void init_globals(void) string_set(&Globals.szSMBPasswdFile, SMB_PASSWD_FILE); string_set(&Globals.szPasswdChat,"*old*password* %o\\n *new*password* %n\\n *new*password* %n\\n *changed*"); string_set(&Globals.szWorkGroup, WORKGROUP); - string_set(&Globals.szPasswdProgram, SMB_PASSWD); + string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM); string_set(&Globals.szPrintcapname, PRINTCAP_NAME); string_set(&Globals.szDriverFile, DRIVERFILE); string_set(&Globals.szLockDir, LOCKDIR); |