- use the correct path to passwd (/usr/bin/ instead of /bin/)

- adjust "passwd chat" to work with non-NIS-passwd, at least
- reflect above changes in manpage

OK'ed by:	maintainer
This commit is contained in:
Dirk Froemberg 2000-02-07 09:46:02 +00:00
parent 1756084010
commit bde2717424
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=25554
6 changed files with 66 additions and 9 deletions

View file

@ -1,5 +1,5 @@
--- Makefile.in.orig Sun Feb 7 07:51:43 1999
+++ Makefile.in Sun Feb 7 22:09:39 1999
--- Makefile.in.orig Wed Jul 21 03:24:31 1999
+++ Makefile.in Fri Oct 15 12:04:52 1999
@@ -23,9 +23,7 @@
BASEDIR= @prefix@
@ -11,7 +11,7 @@
LIBDIR = @libdir@
VARDIR = @localstatedir@
MANDIR = @mandir@
@@ -36,8 +34,9 @@
@@ -36,12 +34,13 @@
# set these to where to find various files
# These can be overridden by command line switches (see smbd(8))
# or in smb.conf (see smb.conf(5))
@ -23,6 +23,11 @@
CONFIGFILE = $(LIBDIR)/smb.conf
LMHOSTSFILE = $(LIBDIR)/lmhosts
DRIVERFILE = $(LIBDIR)/printers.def
-PASSWD_PROGRAM = /bin/passwd
+PASSWD_PROGRAM = /usr/bin/passwd
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
@@ -53,6 +52,9 @@
# the directory where lock files go
LOCKDIR = @lockdir@

View file

@ -0,0 +1,14 @@
--- include/local.h.orig Thu Nov 11 03:36:00 1999
+++ include/local.h Fri Feb 4 11:33:01 2000
@@ -178,9 +178,9 @@
* Default passwd chat script.
*/
-#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*"
+#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n"
/* Minimum length of allowed password when changing UNIX password. */
-#define MINPASSWDLENGTH 5
+#define MINPASSWDLENGTH 6
#endif

View file

@ -1,5 +1,5 @@
--- Makefile.in.orig Sun Feb 7 07:51:43 1999
+++ Makefile.in Sun Feb 7 22:09:39 1999
--- Makefile.in.orig Wed Jul 21 03:24:31 1999
+++ Makefile.in Fri Oct 15 12:04:52 1999
@@ -23,9 +23,7 @@
BASEDIR= @prefix@
@ -11,7 +11,7 @@
LIBDIR = @libdir@
VARDIR = @localstatedir@
MANDIR = @mandir@
@@ -36,8 +34,9 @@
@@ -36,12 +34,13 @@
# set these to where to find various files
# These can be overridden by command line switches (see smbd(8))
# or in smb.conf (see smb.conf(5))
@ -23,6 +23,11 @@
CONFIGFILE = $(LIBDIR)/smb.conf
LMHOSTSFILE = $(LIBDIR)/lmhosts
DRIVERFILE = $(LIBDIR)/printers.def
-PASSWD_PROGRAM = /bin/passwd
+PASSWD_PROGRAM = /usr/bin/passwd
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
@@ -53,6 +52,9 @@
# the directory where lock files go
LOCKDIR = @lockdir@

14
net/samba/files/patch-aj Normal file
View file

@ -0,0 +1,14 @@
--- include/local.h.orig Thu Nov 11 03:36:00 1999
+++ include/local.h Fri Feb 4 11:33:01 2000
@@ -178,9 +178,9 @@
* Default passwd chat script.
*/
-#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*"
+#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n"
/* Minimum length of allowed password when changing UNIX password. */
-#define MINPASSWDLENGTH 5
+#define MINPASSWDLENGTH 6
#endif

View file

@ -1,5 +1,5 @@
--- Makefile.in.orig Sun Feb 7 07:51:43 1999
+++ Makefile.in Sun Feb 7 22:09:39 1999
--- Makefile.in.orig Wed Jul 21 03:24:31 1999
+++ Makefile.in Fri Oct 15 12:04:52 1999
@@ -23,9 +23,7 @@
BASEDIR= @prefix@
@ -11,7 +11,7 @@
LIBDIR = @libdir@
VARDIR = @localstatedir@
MANDIR = @mandir@
@@ -36,8 +34,9 @@
@@ -36,12 +34,13 @@
# set these to where to find various files
# These can be overridden by command line switches (see smbd(8))
# or in smb.conf (see smb.conf(5))
@ -23,6 +23,11 @@
CONFIGFILE = $(LIBDIR)/smb.conf
LMHOSTSFILE = $(LIBDIR)/lmhosts
DRIVERFILE = $(LIBDIR)/printers.def
-PASSWD_PROGRAM = /bin/passwd
+PASSWD_PROGRAM = /usr/bin/passwd
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
@@ -53,6 +52,9 @@
# the directory where lock files go
LOCKDIR = @lockdir@

14
net/samba3/files/patch-aj Normal file
View file

@ -0,0 +1,14 @@
--- include/local.h.orig Thu Nov 11 03:36:00 1999
+++ include/local.h Fri Feb 4 11:33:01 2000
@@ -178,9 +178,9 @@
* Default passwd chat script.
*/
-#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*"
+#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n"
/* Minimum length of allowed password when changing UNIX password. */
-#define MINPASSWDLENGTH 5
+#define MINPASSWDLENGTH 6
#endif