add new patches
This commit is contained in:
form
parent
810ea821e0
commit
f42fe1f6dc
@ -1,10 +1,166 @@
|
||||
--- includes.h.~1~ Thu Feb 12 17:44:28 1998
|
||||
+++ includes.h Fri Mar 13 21:07:30 1998
|
||||
@@ -530,6 +530,7 @@
|
||||
#ifdef __OpenBSD__
|
||||
#include <strings.h>
|
||||
#include <netinet/tcp.h>
|
||||
+#include <arpa/inet.h>
|
||||
#define NO_GETSPNAM
|
||||
#define SIGNAL_CAST (void (*)())
|
||||
#define USE_DIRECT
|
||||
*** Makefile.orig Sat Mar 28 05:59:09 1998
|
||||
--- Makefile Wed Apr 22 13:19:36 1998
|
||||
***************
|
||||
*** 5,11 ****
|
||||
###########################################################################
|
||||
|
||||
# The base directory for all samba files
|
||||
! BASEDIR = /usr/local/samba
|
||||
|
||||
# The base manpages directory to put the man pages in
|
||||
# Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
|
||||
--- 5,11 ----
|
||||
###########################################################################
|
||||
|
||||
# The base directory for all samba files
|
||||
! BASEDIR = /usr/local
|
||||
|
||||
# The base manpages directory to put the man pages in
|
||||
# Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
|
||||
***************
|
||||
*** 18,33 ****
|
||||
# normally only applies to nmbd and smbd
|
||||
# SBINDIR implies a secure binary directory
|
||||
BINDIR = $(BASEDIR)/bin
|
||||
! SBINDIR = $(BASEDIR)/bin
|
||||
! LIBDIR = $(BASEDIR)/lib
|
||||
! VARDIR = $(BASEDIR)/var
|
||||
|
||||
# The permissions to give the executables
|
||||
INSTALLPERMS = 0755
|
||||
|
||||
# Add any optimisation or debugging flags here
|
||||
# add -DSYSLOG for syslog support
|
||||
! FLAGS1 = -O
|
||||
LIBS1 =
|
||||
|
||||
# You will need to use a ANSI C compiler. This means under SunOS 4 you can't
|
||||
--- 18,34 ----
|
||||
# normally only applies to nmbd and smbd
|
||||
# SBINDIR implies a secure binary directory
|
||||
BINDIR = $(BASEDIR)/bin
|
||||
! SBINDIR = $(BASEDIR)/sbin
|
||||
! LIBDIR = $(BASEDIR)/lib/samba
|
||||
! ETCDIR = /etc/samba
|
||||
! VARDIR = /var
|
||||
|
||||
# The permissions to give the executables
|
||||
INSTALLPERMS = 0755
|
||||
|
||||
# Add any optimisation or debugging flags here
|
||||
# add -DSYSLOG for syslog support
|
||||
! FLAGS1 = -O -DQUOTAS -DALLOW_CHANGE_PASSWORD
|
||||
LIBS1 =
|
||||
|
||||
# You will need to use a ANSI C compiler. This means under SunOS 4 you can't
|
||||
***************
|
||||
*** 45,61 ****
|
||||
# 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))
|
||||
! SMBLOGFILE = $(VARDIR)/log.smb
|
||||
! NMBLOGFILE = $(VARDIR)/log.nmb
|
||||
! CONFIGFILE = $(LIBDIR)/smb.conf
|
||||
! LMHOSTSFILE = $(LIBDIR)/lmhosts
|
||||
! DRIVERFILE = $(LIBDIR)/printers.def
|
||||
SMB_PASSWD = $(BINDIR)/smbpasswd
|
||||
! SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
|
||||
WEB_ROOT = $(BASEDIR)
|
||||
|
||||
# the directory where lock files go
|
||||
! LOCKDIR = $(VARDIR)/locks
|
||||
|
||||
# The directory where code page definition files go
|
||||
CODEPAGEDIR = $(LIBDIR)/codepages
|
||||
--- 46,62 ----
|
||||
# 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))
|
||||
! SMBLOGFILE = $(VARDIR)/log/smb
|
||||
! NMBLOGFILE = $(VARDIR)/log/nmb
|
||||
! CONFIGFILE = $(ETCDIR)/smb.conf
|
||||
! LMHOSTSFILE = $(ETCDIR)/lmhosts
|
||||
! DRIVERFILE = $(ETCDIR)/printers.def
|
||||
SMB_PASSWD = $(BINDIR)/smbpasswd
|
||||
! SMB_PASSWD_FILE = $(ETCDIR)/smbpasswd
|
||||
WEB_ROOT = $(BASEDIR)
|
||||
|
||||
# the directory where lock files go
|
||||
! LOCKDIR = $(VARDIR)/spool/lock
|
||||
|
||||
# The directory where code page definition files go
|
||||
CODEPAGEDIR = $(LIBDIR)/codepages
|
||||
***************
|
||||
*** 64,70 ****
|
||||
|
||||
# set this to the default group you want your machine to appear in
|
||||
# for browsing. This can also be set in nmbd (see nmbd(8))
|
||||
! WORKGROUP = WORKGROUP
|
||||
|
||||
# set this to the name of the default account, which is the one
|
||||
# to use when no username or password is specified. This can be overridden
|
||||
--- 65,71 ----
|
||||
|
||||
# set this to the default group you want your machine to appear in
|
||||
# for browsing. This can also be set in nmbd (see nmbd(8))
|
||||
! WORKGROUP = SAMBA
|
||||
|
||||
# set this to the name of the default account, which is the one
|
||||
# to use when no username or password is specified. This can be overridden
|
||||
***************
|
||||
*** 429,436 ****
|
||||
|
||||
# This is for OpenBSD
|
||||
# contributed by todd@openbsd.org
|
||||
! # FLAGSM = -DFAST_SHARE_MODES -DBSD44
|
||||
! # LIBSM =
|
||||
|
||||
# This is for NEXTSTEP Release 2.X
|
||||
# No Posix.
|
||||
--- 430,437 ----
|
||||
|
||||
# This is for OpenBSD
|
||||
# contributed by todd@openbsd.org
|
||||
! FLAGSM = -DFAST_SHARE_MODES -DBSD44
|
||||
! LIBSM =
|
||||
|
||||
# This is for NEXTSTEP Release 2.X
|
||||
# No Posix.
|
||||
***************
|
||||
*** 823,830 ****
|
||||
install: installbin installman installscripts installcp
|
||||
|
||||
installbin: all
|
||||
! @$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
|
||||
! @$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
|
||||
|
||||
installscripts:
|
||||
@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
|
||||
--- 824,831 ----
|
||||
install: installbin installman installscripts installcp
|
||||
|
||||
installbin: all
|
||||
! @$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(VARDIR) $(SPROGS)
|
||||
! @$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(VARDIR) $(PROGS)
|
||||
|
||||
installscripts:
|
||||
@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
|
||||
***************
|
||||
*** 846,853 ****
|
||||
@$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
|
||||
|
||||
uninstallbin:
|
||||
! @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
|
||||
! @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
|
||||
|
||||
uninstallscripts:
|
||||
@$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
|
||||
--- 847,854 ----
|
||||
@$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
|
||||
|
||||
uninstallbin:
|
||||
! @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(VARDIR) $(SPROGS)
|
||||
! @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(VARDIR) $(PROGS)
|
||||
|
||||
uninstallscripts:
|
||||
@$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
|
||||
|
||||
@ -1,20 +1,14 @@
|
||||
--- message.c.~1~ Mon Jan 26 12:05:40 1998
|
||||
+++ message.c Fri Mar 13 20:56:23 1998
|
||||
@@ -53,14 +53,13 @@
|
||||
}
|
||||
*** includes.h.orig Tue Apr 21 17:30:18 1998
|
||||
--- includes.h Tue Apr 21 17:39:57 1998
|
||||
***************
|
||||
*** 554,559 ****
|
||||
--- 554,562 ----
|
||||
#define HAVE_MEMMOVE
|
||||
#define USE_GETCWD
|
||||
#define USE_SETSID
|
||||
+ #ifdef ALLOW_CHANGE_PASSWORD
|
||||
+ #include <termios.h>
|
||||
+ #endif
|
||||
#endif
|
||||
|
||||
/* put it in a temporary file */
|
||||
- sprintf(s,"%s/msg.XXXXXX",tmpdir());
|
||||
- fstrcpy(name,(char *)mktemp(s));
|
||||
-
|
||||
- fd = open(name,O_WRONLY|O_CREAT|O_TRUNC|O_EXCL,0600);
|
||||
+ snprintf(s, sizeof(s),"%s/msg.XXXXXX",tmpdir());
|
||||
+ fd = mkstemp( s );
|
||||
if (fd == -1) {
|
||||
DEBUG(1,("can't open message file %s\n",name));
|
||||
return;
|
||||
}
|
||||
+ fstrcpy(name,s);
|
||||
|
||||
for (i=0;i<msgpos;) {
|
||||
if (msgbuf[i]=='\r' && i<(msgpos-1) && msgbuf[i+1]=='\n') {
|
||||
#ifdef AIX
|
||||
|
||||
19
net/samba/patches/patch-ac
Normal file
19
net/samba/patches/patch-ac
Normal file
@ -0,0 +1,19 @@
|
||||
*** nmbd_packets.c.orig Tue Apr 21 17:54:56 1998
|
||||
--- nmbd_packets.c Tue Apr 21 17:55:40 1998
|
||||
***************
|
||||
*** 315,321 ****
|
||||
struct nmb_packet *nmb = &packet->packet.nmb;
|
||||
char second_ip_buf[25];
|
||||
|
||||
! strcpy(second_ip_buf, inet_ntoa(packet->ip));
|
||||
|
||||
nmb->header.opcode = NMB_NAME_MULTIHOMED_REG_OPCODE;
|
||||
nmb->header.arcount = 1;
|
||||
--- 315,321 ----
|
||||
struct nmb_packet *nmb = &packet->packet.nmb;
|
||||
char second_ip_buf[25];
|
||||
|
||||
! strcpy(second_ip_buf, (char *)inet_ntoa(packet->ip));
|
||||
|
||||
nmb->header.opcode = NMB_NAME_MULTIHOMED_REG_OPCODE;
|
||||
nmb->header.arcount = 1;
|
||||
19
net/samba/patches/patch-ad
Normal file
19
net/samba/patches/patch-ad
Normal file
@ -0,0 +1,19 @@
|
||||
*** nmbd_subnetdb.c.orig Tue Apr 21 18:09:01 1998
|
||||
--- nmbd_subnetdb.c Tue Apr 21 18:09:39 1998
|
||||
***************
|
||||
*** 186,192 ****
|
||||
struct subnet_record *subrec;
|
||||
struct interface *iface = get_interface(i);
|
||||
|
||||
! if((subrec = make_subnet(inet_ntoa(iface->ip), NORMAL_SUBNET,
|
||||
iface->ip, iface->bcast,iface->nmask)) == NULL)
|
||||
return False;
|
||||
add_subnet(subrec);
|
||||
--- 186,192 ----
|
||||
struct subnet_record *subrec;
|
||||
struct interface *iface = get_interface(i);
|
||||
|
||||
! if((subrec = make_subnet((char *)inet_ntoa(iface->ip), NORMAL_SUBNET,
|
||||
iface->ip, iface->bcast,iface->nmask)) == NULL)
|
||||
return False;
|
||||
add_subnet(subrec);
|
||||
Loading…
Reference in New Issue
Block a user