summaryrefslogtreecommitdiff
path: root/source3/Makefile.in
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-11-10 00:37:14 +0000
committerJeremy Allison <jra@samba.org>1998-11-10 00:37:14 +0000
commit5c3295c16dd1638a03d9f80fed455c9826e478cb (patch)
treed36a0aacf2086ef37833e0c215d8f5a7c6ad2ab4 /source3/Makefile.in
parent2561e062b9e4ef2ee7a59bea80422379b7009c79 (diff)
downloadsamba-5c3295c16dd1638a03d9f80fed455c9826e478cb.tar.gz
samba-5c3295c16dd1638a03d9f80fed455c9826e478cb.tar.bz2
samba-5c3295c16dd1638a03d9f80fed455c9826e478cb.zip
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. (This used to be commit 8c1625365479f12fa544d83e1a9f72a548398108)
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r--source3/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 253f7f2809..ad5428e1e4 100644
--- a/source3/Makefile.in
+++ b/source3/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)\"