From bde271742461c30d0523eecb8355abeca1fab472 Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Mon, 7 Feb 2000 09:46:02 +0000 Subject: [PATCH] - 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 --- net/samba-devel/files/patch-aa | 11 ++++++++--- net/samba-devel/files/patch-aj | 14 ++++++++++++++ net/samba/files/patch-aa | 11 ++++++++--- net/samba/files/patch-aj | 14 ++++++++++++++ net/samba3/files/patch-aa | 11 ++++++++--- net/samba3/files/patch-aj | 14 ++++++++++++++ 6 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 net/samba-devel/files/patch-aj create mode 100644 net/samba/files/patch-aj create mode 100644 net/samba3/files/patch-aj diff --git a/net/samba-devel/files/patch-aa b/net/samba-devel/files/patch-aa index 65fbd41e497b..3c705946b562 100644 --- a/net/samba-devel/files/patch-aa +++ b/net/samba-devel/files/patch-aa @@ -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@ diff --git a/net/samba-devel/files/patch-aj b/net/samba-devel/files/patch-aj new file mode 100644 index 000000000000..5e31ad8ebaa7 --- /dev/null +++ b/net/samba-devel/files/patch-aj @@ -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 diff --git a/net/samba/files/patch-aa b/net/samba/files/patch-aa index 65fbd41e497b..3c705946b562 100644 --- a/net/samba/files/patch-aa +++ b/net/samba/files/patch-aa @@ -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@ diff --git a/net/samba/files/patch-aj b/net/samba/files/patch-aj new file mode 100644 index 000000000000..5e31ad8ebaa7 --- /dev/null +++ b/net/samba/files/patch-aj @@ -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 diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa index 65fbd41e497b..3c705946b562 100644 --- a/net/samba3/files/patch-aa +++ b/net/samba3/files/patch-aa @@ -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@ diff --git a/net/samba3/files/patch-aj b/net/samba3/files/patch-aj new file mode 100644 index 000000000000..5e31ad8ebaa7 --- /dev/null +++ b/net/samba3/files/patch-aj @@ -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