1 diff -urN samba-2.2.0.org/source/Makefile.in samba-2.2.0/source/Makefile.in
2 --- samba-2.2.0.org/source/Makefile.in Wed Apr 18 01:27:35 2001
3 +++ samba-2.2.0/source/Makefile.in Wed Apr 18 01:48:43 2001
5 CONFIGFILE = $(CONFIGDIR)/smb.conf
6 LMHOSTSFILE = $(CONFIGDIR)/lmhosts
7 DRIVERFILE = $(CONFIGDIR)/printers.def
8 -PASSWD_PROGRAM = /bin/passwd
9 +PASSWD_PROGRAM = /usr/bin/passwd
10 # This is where smbpasswd et al go
11 PRIVATEDIR = @privatedir@
13 diff -urN samba-2.2.0.org/source/configure.in samba-2.2.0/source/configure.in
14 --- samba-2.2.0.org/source/configure.in Wed Apr 18 01:27:35 2001
15 +++ samba-2.2.0/source/configure.in Wed Apr 18 01:48:11 2001
20 +# Check for yp_get_default_domain in -lnsl (linux glibc2.1)
22 +AC_LIBTESTFUNC(nsl, yp_get_default_domain)
25 # Check for the functions putprpwnam, set_auth_parameters,
26 # getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
27 # Needed for OSF1 and HPUX.
33 + LIBS="$LIBS -ldl -lpam -lpamc"
41 - withval="/usr/local/ssl" # default
42 + withval="/usr" # default
44 if test "${with_sslinc+set}" = set; then
46 @@ -1720,12 +1725,11 @@
49 echo "configure: warning: --with-sslinc called without argument - will use default" 1>&w
50 - CFLAGS="-I/usr/local/ssl/include $CFLAGS"
51 + CFLAGS="-I/usr/include/openssl $CFLAGS"
52 LIBS="-lssl -lcrypto $LIBS"
53 - LDFLAGS="=L/usr/local/ssl/lib $LDFLAGS"
56 - CFLAGS="-I${withval}/include $CFLAGS"
57 + CFLAGS="-I${withval}/include/openssl $CFLAGS"
58 LIBS="-lssl -lcrypto $LIBS"
59 LDFLAGS="-L${withval}/lib $LDFLAGS"
61 diff -urN samba-2.2.0.org/source/smbwrapper/smbsh.in samba-2.2.0/source/smbwrapper/smbsh.in
62 --- samba-2.2.0.org/source/smbwrapper/smbsh.in Wed Apr 18 01:27:40 2001
63 +++ samba-2.2.0/source/smbwrapper/smbsh.in Wed Apr 18 01:48:11 2001
67 -SMBW_LIBDIR=${SMBW_LIBDIR-@builddir@/smbwrapper}
68 +SMBW_LIBDIR=${SMBW_LIBDIR-/lib/security}
70 if [ ! -f ${SMBW_LIBDIR}/smbwrapper.so ]; then
71 echo You need to set LIBDIR in smbsh