*** ./examples/VFS/configure.in.osr6 Wed Nov 14 19:15:03 2007 --- ./examples/VFS/configure.in Thu Feb 21 10:07:46 2008 *************** *** 175,181 **** # these are the defaults, good for lots of systems HOST_OS="$host_os" ! LDSHFLAGS="-shared" SONAMEFLAG="#" SHLD="\${CC}" PICFLAGS="" --- 175,181 ---- # these are the defaults, good for lots of systems HOST_OS="$host_os" ! LDSHFLAGS="-G" SONAMEFLAG="#" SHLD="\${CC}" PICFLAGS="" *************** *** 283,288 **** --- 283,294 ---- SONAMEFLAG="-Wl,-soname," PICFLAGS="-fPIC" ;; + *sysv5*) + BLDSHARED="true" + LDSHFLAGS="-G" + DYNEXP="-Wl,-Bexport" + PICFLAGS="-KPIC" + ;; *sco*) ;; *unixware*) *************** *** 306,314 **** esac ;; - *sysv5*) - LDSHFLAGS="-G" - ;; *vos*) BLDSHARED="false" LDSHFLAGS="" --- 312,317 ---- *** ./examples/VFS/autogen.sh.osr6 Wed Nov 14 19:15:03 2007 --- ./examples/VFS/autogen.sh Thu Feb 21 10:07:46 2008 *************** *** 49,56 **** rm -rf autom4te*.cache ! echo "$0: running $AUTOHEADER" ! $AUTOHEADER || exit 1 echo "$0: running $AUTOCONF" $AUTOCONF || exit 1 --- 49,56 ---- rm -rf autom4te*.cache ! #echo "$0: running $AUTOHEADER" ! #$AUTOHEADER || exit 1 echo "$0: running $AUTOCONF" $AUTOCONF || exit 1 *** ./examples/VFS/Makefile.in.osr6 Wed Nov 14 19:15:03 2007 --- ./examples/VFS/Makefile.in Thu Feb 21 10:07:46 2008 *************** *** 7,13 **** SAMBA_SOURCE = @SAMBA_SOURCE@ SHLIBEXT = @SHLIBEXT@ OBJEXT = @OBJEXT@ ! FLAGS = $(CFLAGS) $(CPPFLAGS) -fPIC \ -Iinclude -I$(SAMBA_SOURCE)/include \ -I$(SAMBA_SOURCE)/popt \ -I$(SAMBA_SOURCE)/lib/replace \ --- 7,13 ---- SAMBA_SOURCE = @SAMBA_SOURCE@ SHLIBEXT = @SHLIBEXT@ OBJEXT = @OBJEXT@ ! FLAGS = $(CFLAGS) $(CPPFLAGS) -KPIC \ -Iinclude -I$(SAMBA_SOURCE)/include \ -I$(SAMBA_SOURCE)/popt \ -I$(SAMBA_SOURCE)/lib/replace \ *** ./examples/VFS/skel_opaque.c.osr6 Wed Nov 14 19:15:03 2007 --- ./examples/VFS/skel_opaque.c Thu Feb 21 10:07:46 2008 *************** *** 50,56 **** static void skel_disconnect(vfs_handle_struct *handle, connection_struct *conn) { - return; } static SMB_BIG_UINT skel_disk_free(vfs_handle_struct *handle, const char *path, --- 50,55 ---- *************** *** 93,99 **** static void skel_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, long offset) { ! return vfswrap_seekdir(NULL, dirp, offset); } static long skel_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) --- 92,98 ---- static void skel_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, long offset) { ! vfswrap_seekdir(NULL, dirp, offset); } static long skel_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) *************** *** 103,109 **** static void skel_rewinddir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) { ! return vfswrap_rewinddir(NULL, dirp); } static int skel_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode) --- 102,108 ---- static void skel_rewinddir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) { ! vfswrap_rewinddir(NULL, dirp); } static int skel_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode) *** ./examples/VFS/skel_transparent.c.osr6 Wed Nov 14 19:15:03 2007 --- ./examples/VFS/skel_transparent.c Thu Feb 21 10:07:46 2008 *************** *** 87,93 **** static void skel_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, long offset) { ! return SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset); } static long skel_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) --- 87,93 ---- static void skel_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, long offset) { ! SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset); } static long skel_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) *************** *** 97,103 **** static void skel_rewinddir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) { ! return SMB_VFS_NEXT_REWINDDIR(handle, dirp); } static int skel_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode) --- 97,103 ---- static void skel_rewinddir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) { ! SMB_VFS_NEXT_REWINDDIR(handle, dirp); } static int skel_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode) *** ./examples/libsmbclient/smbwrapper/wrapper.c.osr6 Wed Nov 14 19:15:03 2007 --- ./examples/libsmbclient/smbwrapper/wrapper.c Thu Feb 21 10:07:46 2008 *************** *** 326,362 **** memset(dest, '\0', sizeof(*dest)); dest->d_ino = src->d_ino; dest->d_off = src->d_off; - - switch(src->d_type) - { - case SMBC_WORKGROUP: - case SMBC_SERVER: - case SMBC_FILE_SHARE: - case SMBC_DIR: - dest->d_type = DT_DIR; - break; - - case SMBC_FILE: - dest->d_type = DT_REG; - break; - - case SMBC_PRINTER_SHARE: - dest->d_type = DT_CHR; - break; - - case SMBC_COMMS_SHARE: - dest->d_type = DT_SOCK; - break; - - case SMBC_IPC_SHARE: - dest->d_type = DT_FIFO; - break; - - case SMBC_LINK: - dest->d_type = DT_LNK; - break; - } - dest->d_reclen = src->d_reclen; smbw_strlcpy(dest->d_name, src->d_name, sizeof(dest->d_name)); p = dest->d_name + strlen(dest->d_name) + 1; --- 326,331 ---- *************** *** 372,408 **** memset(dest, '\0', sizeof(*dest)); dest->d_ino = src->d_ino; dest->d_off = src->d_off; - - switch(src->d_type) - { - case SMBC_WORKGROUP: - case SMBC_SERVER: - case SMBC_FILE_SHARE: - case SMBC_DIR: - dest->d_type = DT_DIR; - break; - - case SMBC_FILE: - dest->d_type = DT_REG; - break; - - case SMBC_PRINTER_SHARE: - dest->d_type = DT_CHR; - break; - - case SMBC_COMMS_SHARE: - dest->d_type = DT_SOCK; - break; - - case SMBC_IPC_SHARE: - dest->d_type = DT_FIFO; - break; - - case SMBC_LINK: - dest->d_type = DT_LNK; - break; - } - dest->d_reclen = src->d_reclen; smbw_strlcpy(dest->d_name, src->d_name, sizeof(dest->d_name)); p = dest->d_name + strlen(dest->d_name) + 1; --- 341,346 ---- *************** *** 557,563 **** ** Wrapper Functions **/ ! int open(__const char *name, int flags, ...) { va_list ap; mode_t mode; --- 495,501 ---- ** Wrapper Functions **/ ! int open(char *name, int flags, ...) { va_list ap; mode_t mode; *************** *** 585,591 **** return openx(name, flags, mode, smbw_libc.__open); } ! int open64 (__const char *name, int flags, ...) { va_list ap; mode_t mode; --- 523,529 ---- return openx(name, flags, mode, smbw_libc.__open); } ! int open64 (char *name, int flags, ...) { va_list ap; mode_t mode; *************** *** 1356,1362 **** return (* smbw_libc.lstat64)((char *) name, st64); } ! int _llseek(unsigned int fd, unsigned long offset_high, unsigned long offset_low, loff_t *result, unsigned int whence) { check_init("_llseek"); --- 1294,1300 ---- return (* smbw_libc.lstat64)((char *) name, st64); } ! int _llseek(unsigned int fd, unsigned long offset_high, unsigned long offset_low, off_t *result, unsigned int whence) { check_init("_llseek"); *** ./examples/libsmbclient/smbwrapper/wrapper.h.osr6 Wed Nov 14 19:15:03 2007 --- ./examples/libsmbclient/smbwrapper/wrapper.h Thu Feb 21 10:07:46 2008 *************** *** 32,41 **** --- 32,85 ---- #include #include + #ifdef open + #undef open + #endif + + #ifdef pread + #undef pread + #endif + + #ifdef pwrite + #undef pwrite + #endif + + #ifdef lseek + #undef lseek + #endif + + #ifdef creat + #undef creat + #endif + + #ifdef stat + #undef stat + #endif + + #ifdef fstat + #undef fstat + #endif + + #ifdef lstat + #undef lstat + #endif + + #ifdef readdir + #undef readdir + #endif + + #ifdef readdir_r + #undef readdir_r + #endif + #ifndef __FD_SETSIZE # define __FD_SETSIZE 256 #endif + #ifndef PATH_MAX + # define PATH_MAX 1024 + #endif + extern int smbw_fd_map[__FD_SETSIZE]; extern int smbw_ref_count[__FD_SETSIZE]; extern char smbw_cwd[PATH_MAX]; *************** *** 66,77 **** char d_comment[256]; /* comment */ } SMBW_dirent; - struct kernel_sigaction { - __sighandler_t k_sa_handler; - unsigned long sa_flags; - sigset_t sa_mask; - }; - typedef struct SMBW_libc { /* write() is first, to allow debugging */ --- 110,115 ---- *************** *** 142,148 **** int (* fstat64)(int fd, struct stat64 *st64); int (* __lxstat64)(int ver, char *name, struct stat64 *st64); int (* lstat64)(char *name, struct stat64 *st64); ! int (* _llseek)(unsigned int fd, unsigned long offset_high, unsigned long offset_low, loff_t *result, unsigned int whence); struct dirent64 * (* readdir64)(DIR *dir); int (* readdir_r)(DIR *dir, struct dirent *entry, struct dirent **result); int (* readdir64_r)(DIR *dir, struct dirent64 *entry, struct dirent64 **result); --- 180,186 ---- int (* fstat64)(int fd, struct stat64 *st64); int (* __lxstat64)(int ver, char *name, struct stat64 *st64); int (* lstat64)(char *name, struct stat64 *st64); ! int (* _llseek)(unsigned int fd, unsigned long offset_high, unsigned long offset_low, off_t *result, unsigned int whence); struct dirent64 * (* readdir64)(DIR *dir); int (* readdir_r)(DIR *dir, struct dirent *entry, struct dirent **result); int (* readdir64_r)(DIR *dir, struct dirent64 *entry, struct dirent64 **result); --- ./examples/libsmbclient/smbwrapper/Makefile.osr6 2008-05-28 05:41:11.000000000 -0700 +++ ./examples/libsmbclient/smbwrapper/Makefile 2008-06-25 13:10:14.990000011 -0700 @@ -1,12 +1,12 @@ -LIBS = -lsmbclient -ldl +LIBS = -L../../../source/bin -lsmbclient -ldl DEFS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE CFLAGS = -I$(SAMBA_INCL) $(EXTLIB_INCL) -LDFLAGS = -L/usr/local/samba/lib +LDFLAGS = SMBINCLUDE = -I../../../source/include -CFLAGS= -fpic -g -O0 $(DEFS) $(SMBINCLUDE) +CFLAGS= -Kpthread -Kpic -O $(DEFS) $(SMBINCLUDE) BIN = . @@ -16,24 +16,23 @@ SMBWRAPPER_OBJS = smbw.o smbw_dir.o smbw_stat.o wrapper.o select.o $(STRFUNC) SMBSH_OBJS = smbsh.o $(STRFUNC) -all: $(BIN)/smbwrapper.so $(BIN)/smbsh +all: $(BIN)/smbsh $(BIN)/smbwrapper.so: $(SMBWRAPPER_OBJS) - $(CC) -g \ - -Wl,-init=smbw_initialize \ - -shared \ - --export-all-symbols \ + $(CC) -Kpthread \ + -G \ + -Wl,-Bexport \ + -Wl,-h=`basename $@` \ -o $(BIN)/smbwrapper.so \ $(SMBWRAPPER_OBJS) \ $(LDFLAGS) \ - $(LIBS) \ - -Wl,-soname=`basename $@` + $(LIBS) $(BIN)/smbsh: $(SMBSH_OBJS) - $(CC) -g -o $(BIN)/smbsh $(SMBSH_OBJS) $(LIBS) $(LDFLAGS) + $(CC) -Kpthread -o $(BIN)/smbsh $(SMBSH_OBJS) $(LIBS) $(LDFLAGS) opendir_smbsh: opendir_smbsh.o - $(CC) -g -o opendir_smbsh opendir_smbsh.o $(LIBS) $(DMALLOC) + $(CC) -Kpthread -o opendir_smbsh opendir_smbsh.o $(LIBS) $(DMALLOC) clean: rm -f *.o *~ opendir_smbsh smbsh smbwrapper.so *** ./examples/pdb/Makefile.osr6 Wed Nov 14 19:15:03 2007 --- ./examples/pdb/Makefile Thu Feb 21 10:07:46 2008 *************** *** 1,24 **** # Makefile for samba-pdb examples # Variables ! CC = gcc LIBTOOL = libtool SAMBA_SRC = ../../source SAMBA_INCL = ../../source/include UBIQX_SRC = ../../source/ubiqx SMBWR_SRC = ../../source/smbwrapper ! CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g -I/usr/include/heimdal -fPIC PDB_OBJS = test.la # Default target default: $(PDB_OBJS) # Pattern rules %.la: %.lo ! $(LIBTOOL) --mode=link $(CC) -module -o $@ $< $(LDFLAGS) -rpath /usr/lib/samba/pdb/ %.lo: %.c $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $< --- 1,30 ---- # Makefile for samba-pdb examples # Variables ! CC = cc LIBTOOL = libtool SAMBA_SRC = ../../source SAMBA_INCL = ../../source/include UBIQX_SRC = ../../source/ubiqx SMBWR_SRC = ../../source/smbwrapper ! CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I/usr/include/heimdal -KPIC PDB_OBJS = test.la # Default target default: $(PDB_OBJS) + test.la: libtest.la + cp libtest.la test.la + + libtest.la: test.lo + $(LIBTOOL) --mode=link $(CC) -G -o $@ test.lo $(LDFLAGS) + # Pattern rules %.la: %.lo ! $(LIBTOOL) --mode=link $(CC) -G -o $@ $< $(LDFLAGS) %.lo: %.c $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $< *** ./packaging/OSR6/MakeCDMT.osr6 Thu Feb 21 11:09:09 2008 --- ./packaging/OSR6/MakeCDMT Thu Feb 21 11:07:51 2008 *************** *** 0 **** --- 1,13 ---- + #!/bin/sh + # + # MakeSSO + # + + CDMT_DIR=`pwd`; export CDMT_DIR + samba_DIR=`pwd`; export samba_DIR + + rm -f CDMT.MACROS Makefile cdmt.config input/* + + mkcdmt -f -d $CDMT_DIR -P samba \ + -D "Samba File and Print Server" \ + -V 3.0.20Dd -p $CDMT_DIR/samba.mkcdmt *** ./packaging/OSR6/ccs.osr6 Thu Feb 21 11:09:09 2008 --- ./packaging/OSR6/ccs Thu Feb 21 11:07:22 2008 *************** *** 0 **** --- 1,621 ---- + #!/ibin/sh + # + # Copyright (C) 2003, 2004, 2005 The Santa Cruz Operation, Inc. + # All Rights Reserved. + # The information in this file is provided for the exclusive use of + # the licensees of The Santa Cruz Operation, Inc. Such users have the + # right to use, modify, and incorporate this code into other products + # for purposes authorized by the license agreement provided they include + # this notice and the associated copyright notice with any such product. + # The information in this file is provided "AS IS" without warranty. + # + #****************************************************************************** + # Generic CCS script -- CHANGE THIS!!! + #----------------------------------------------------------------------------- + # COMMENTS/DESCRIPTION + #----------------------------------------------------------------------------- + # + # input: + # $1 is the name of the step + # $2 is the keyword list (e.g., INSTALL, UPGRADE, REMOVE) + # $3 is the package list + #============================================================================ + + #====================================================================== INT === + # cleanup -- + # + # cleanup exits the package script with the passed argument + # + #------------------------------------------------------------------------------ + cleanup() + { + exit $1 + } + + #====================================================================== INT === + # do_save -- + # + # do_save uses ccsUpgradeTool to save the RTS config files + # + #------------------------------------------------------------------------------ + do_save() + { + return # don't do anything here for now + } + + #=================CUSTOM INSTALLATION STEP FUNCTIONS=================== INT === + # + #====================================================================== INT === + # do_preload -- + # + # If the keyword "UPGRADE" is specified, but the old version being + # upgraded is not an SSO component, special action may be required + # at this point. See guidelines 4.6.2 "How to Handle In-Place Upgrade". + # + # Note that only the files in the "SharedControl" package of the + # component have been loaded onto the target at this point. + # + #------------------------------------------------------------------------------ + do_preload() + { + : + # no work currently defined for here + } + + #====================================================================== INT === + # do_postload -- + # + # No work is defined + # + #------------------------------------------------------------------------------ + do_postload() + { + : + # no work currently defined for here + } + + #====================================================================== INT === + # do_preattach -- + # + # In this step, the ccs should make any necessary version-compatibility + # checks. If, for some reason it is not valid to install the component + # on the given client -- perhaps an inappropriate version of the + # operating system is installed, for instance -- the ccs shoudl return + # an exit code of $FAIL, causing teh installation to fail. + # + # If the keyword "UPGRADE" is specified, but the old version being + # upgraded is not an SSO component, special action is required at this + # point. See guidelines 4.6.2 "How to Handle In-Place Upgrade". + # + #------------------------------------------------------------------------------ + do_preattach() + { + # + # < FILL IN HERE > + # + # perform necessary version-compatibility checks. perform a + # cleanup $FAIL + # if something is not right after loggin the reasons. + # + + # calls do_save to save config files for network client upgrade + # + + do_save + } + + #====================================================================== INT === + # do_postattach -- + # + # If the keyword "UPGRADE" is specified, this is the step in which the + # ccs should merge the old configuration data into the appropriate files. + # + # If the old version being upgraded was not an SSO component, the old + # configuration data will have been saved in the CCS_PERSISTENT_STORAGE by + # an earlier script phase. + # + # After the saved data has been restored, any "query" parameters that + # necessitate further self-configuration should be applied. Only files + # wholly owned by this component -- i.e., those in the /var/opt area + # -- can be modified. + # + #------------------------------------------------------------------------------ + do_postattach() + { + case "$upgrade" in + nonSSOupgrade) + # preserve any needed data from a 3.2v4 installation + ;; + SSOupgrade) + # preserve any needed data from an OSr5 installation + ;; + esac + } + + #====================================================================== INT === + # do_preregister -- + # + # Here is where ScoAdmin OSAs that need to be available to other + # components during those component's "configure" phase should be + # installed. This implies some stringent restrictions on the + # implementation of such OSA's: they must operate completely within + # the boundries of their own component provided tools and data, + # possibly relying as well on tools available in /ibin. + # + #------------------------------------------------------------------------------ + do_preregister() + { + : + # No work defined yet + } + + #====================================================================== INT === + # do_postregister -- + # + # No work is defined + # + #------------------------------------------------------------------------------ + do_postregister() + { + : + # No work defined yet + } + + #====================================================================== INT === + # do_preconfigure -- + # + # The component should configure itself into any system service of which + # it is a consumer. For instance, calls to "idinstall" should be made + # here to add a drive into (or, in the case of a removal, to pull a + # driver out of) the link kit. + # + #------------------------------------------------------------------------------ + do_preconfigure() + { + : + # + # < FILL IN HERE > + # + # This is where things that need to register with OSA's should call + # those OSAs. + } + + #====================================================================== INT === + # do_postconfigure -- + # + # Any remaining configuration that relied on steps taken in the pre- + # configurure and system steps should be completed here + # + #------------------------------------------------------------------------------ + do_postconfigure() + { + SERVICE="swat 901/tcp Samba Web Administration Tool" + INETD="swat stream tcp nowait root /usr/sbin/swat swat" + + grep -q "^swat[ ]" /etc/services || + echo $SERVICE >> /etc/services + + grep -q "^swat[ ]" /etc/inetd.conf || + echo $INETD >> /etc/inetd.conf + + [ -f /etc/inetd.pid ] && kill -HUP `cat /etc/inetd.pid` + } + + #====================================================================== INT === + # do_preexport -- + # + #------------------------------------------------------------------------------ + do_preexport() + { + # Create the default server configuration + [ -d /etc/samba ] || { + mkdir /etc/samba > /dev/null 2>&1 + chown bin /etc/samba > /dev/null 2>&1 + chgrp bin /etc/samba > /dev/null 2>&1 + chmod 0755 /etc/samba > /dev/null 2>&1 + OLDPWD=`pwd` + [ -d ${SSO_CLIENT_ROOT}/etc/samba ] && { + cd ${SSO_CLIENT_ROOT}/etc/samba + /bin/find . -depth -print | /bin/cpio -pdum /etc/samba \ + > /dev/null 2>&1 + cd $OLDPWD + } + } + } + + #====================================================================== INT === + # do_postexport -- + # + # In the final phase, all the remaining public interfaces are exported + # to the system's public name space. + # + #------------------------------------------------------------------------------ + do_postexport() + { + if [ ! -f /etc/samba/smb.conf -a -e ${SMB_DFL} ]; then + name=`uname -n | tr '[:lower:]' '[:upper:]' | tr -d [:punct:] 2> /dev/null` + iflist= + ifconfig -a 2> /dev/null | egrep -q '^(net|du)[0-9]*:' && { + ifconfig -a 2> /dev/null | grep -v LOOPBACK | grep -v inet | grep '^[^ ]*:' | cut -f1 -d: | while read interface + do + iflist="$iflist $interface" + echo "$iflist" > /tmp/__smb__ccs__ + done + iflist=`cat /tmp/__smb__ccs__` + } + sed -e "s/TETHYS/$name/" -e "s/net0 lo0/$iflist lo0/" ${SMB_DFL} > /etc/samba/smb.conf + cp /etc/samba/smb.conf ${SMB_DFL} + chown bin /etc/samba/smb.conf + chgrp bin /etc/samba/smb.conf + chmod 644 /etc/samba/smb.conf + fi + for i in lmhosts smbfstab smbpasswd smbusers + do + [ -e $STORTMP/$i ] && { + cp -p $STORTMP/$i /etc/samba/$i + } + done + # To avoid subsequent custom verification errors, set the permission + for i in smbfstab smbpasswd + do + [ -e /etc/samba/$i ] && { + chmod 600 /etc/samba/$i + } + done + for i in lmhosts smbusers + do + [ -e /etc/samba/$i ] && { + chmod 644 /etc/samba/$i + } + done + # Enable if these services were previously enabled + for i in nmb smb + do + [ -e $STORTMP/$i_enable ] && { + [ -x /etc/init.d/$i ] && { + /etc/init.d/$i enable > /dev/null 2>&1 + } + } + done + rm -rf $STORTMP + + for i in /usr/lib/python?*/lib-dynload + do + [ "$i" = "/usr/lib/python?*/lib-dynload" ] && continue + rm -rf $i/samba + ln -s /usr/lib/python/lib-dynload/samba $i/samba + done + + [ -x /usr/bin/doctool ] && { + /usr/bin/doctool --add $DOC_HOM/DOS_sambaCFG.desktop > /dev/null 2>&1 + /usr/bin/doctool --add $DOC_HOM/DOS_sambaLIB.desktop > /dev/null 2>&1 + /usr/bin/doctool --add $DOC_HOM/DOS_sambaGUIDE.desktop > /dev/null 2>&1 + /usr/bin/doctool --add $DOC_HOM/DOS_sambaMAN.desktop > /dev/null 2>&1 + /usr/bin/doctool --add $DOC_HOM/DOS_sambaUSE.desktop > /dev/null 2>&1 + } + [ -x /usr/man/bin/makewhatis ] && { + /usr/man/bin/makewhatis /usr/man/cat1 > /dev/null 2>&1 + /usr/man/bin/makewhatis /usr/man/cat5 > /dev/null 2>&1 + /usr/man/bin/makewhatis /usr/man/cat7 > /dev/null 2>&1 + /usr/man/bin/makewhatis /usr/man/cat8 > /dev/null 2>&1 + } + } + + #=================CUSTOM REMOVAL STEP FUNCTIONS-----=================== INT === + # + #====================================================================== INT === + # do_preunexport -- + # + # In the first phase, all the extra public interfaces are unexported + # from the system's public name space. + # + #------------------------------------------------------------------------------ + do_preunexport() + { + for service in nmb smb winbind + do + [ -x /etc/init.d/$service ] && { + /etc/init.d/$service disable > /dev/null 2>&1 + /etc/init.d/$service stop > /dev/null 2>&1 + } + done + diff $SMB_DFL /etc/samba/smb.conf > /dev/null && rm -f /etc/samba/smb.conf + rm -rf /usr/lib/python2.3/lib-dynload/samba + [ -x /usr/bin/doctool ] && { + /usr/bin/doctool --remove $DOC_HOM/DOS_sambaCFG.desktop > /dev/null 2>&1 + /usr/bin/doctool --remove $DOC_HOM/DOS_sambaLIB.desktop > /dev/null 2>&1 + /usr/bin/doctool --remove $DOC_HOM/DOS_sambaGUIDE.desktop > /dev/null 2>&1 + /usr/bin/doctool --remove $DOC_HOM/DOS_sambaMAN.desktop > /dev/null 2>&1 + /usr/bin/doctool --remove $DOC_HOM/DOS_sambaUSE.desktop > /dev/null 2>&1 + } + [ -x /usr/man/bin/makewhatis ] && { + /usr/man/bin/makewhatis /usr/man/cat1 > /dev/null 2>&1 + /usr/man/bin/makewhatis /usr/man/cat5 > /dev/null 2>&1 + /usr/man/bin/makewhatis /usr/man/cat7 > /dev/null 2>&1 + /usr/man/bin/makewhatis /usr/man/cat8 > /dev/null 2>&1 + } + } + + #====================================================================== INT === + # do_postunexport -- + # + #------------------------------------------------------------------------------ + do_postunexport() + { + for i in /etc/samba/* + do + [ -f ${SSO_CLIENT_ROOT}$i ] && { + cmp $i ${SSO_CLIENT_ROOT}$i > /dev/null && rm -f $i + } + done + for i in /etc/samba/* + do + [ "$i" = "/etc/samba/*" ] && rmdir /etc/samba + done + rm -rf /usr/lib/samba /usr/share/samba + } + + #====================================================================== INT === + # do_preunconfigure -- + # + # The component should unconfigure itself from any system service it is + # a consumer of, using calls to the appropriate service interface. For + # instance, kernel drivers should be removed by a call to the "idinstall" + # utility. + # + #------------------------------------------------------------------------------ + do_preunconfigure() + { + : + # + # < FILL IN HERE > + # + # This is where things that needed to register with OSA's should + # remove themselves from those OSAs. + } + + #====================================================================== INT === + # do_postunconfigure -- + # + # No work is defined + # + #------------------------------------------------------------------------------ + do_postunconfigure() + { + : + # No work defined yet + } + + #====================================================================== INT === + # do_preunregister -- + # + # For components which provide system services, any work which is + # necessary prior to the removal of those services should be completed + # in this step. Depending on the service, it may be appropriate to + # inform all service consumers of the service's removal, using a + # provider-defined interface. See the guidlines 3.4 "Responsibilies + # involved with providing a system service." + # + #------------------------------------------------------------------------------ + do_preunregister() + { + : + # + # < FILL IN HERE > + # + # This is where OSAs should call classconf & osaconf to remove + # themselves from the osa registration database + # + } + + #====================================================================== INT === + # do_postunregister -- + # + # No work is defined + # + #------------------------------------------------------------------------------ + do_postunregister() + { + : + # No work defined yet + } + + #====================================================================== INT === + # do_preunattach -- + # + # No work is defined + # + #------------------------------------------------------------------------------ + do_preunattach() + { + : + # No work defined yet + } + + #====================================================================== INT === + # do_postunattach -- + # + # No work is defined + # + #------------------------------------------------------------------------------ + do_postunattach() + { + : + # No work defined yet + } + + + #====================================================================== INT === + # do_preunload -- + # + # No work is defined + # + #------------------------------------------------------------------------------ + do_preunload() + { + : + # No work defined yet + } + + #====================================================================== INT === + # do_postunload -- + # + # No work is defined + # + #------------------------------------------------------------------------------ + do_postunload() + { + : + # No work defined yet + } + + #====================================================================== INT === + # main -- + # + # Based on step specified, perform actions of the general form: + # Global initialization + # Loop to call each package script for package-specific actions + # Global cleanup + # + # NOTE: Currently, a number of steps exist for which no action needs to + # be specified in this product. This will probably be true for most + # products in the near future. + #------------------------------------------------------------------------------ + + # NOTE: Do not "cd" around the place as the SSO_CLIENT_ROOT and related + # variables are of relative path and your use of them will be damaged + # if you change your location. + + # set a trap so if the user dels out, a WARN exit value is passed + # to the calling program + trap 'cleanup $WARN' 1 2 3 15 + + # Process the arguments to this script and perform action + # for the step being executed currently + pkg_step=$1 + pkg_keywords=$2 + pkg_list=$3 + + # Source in the standard functions library + . ccsSetup.sh + ETCISL= + # source in iqm file or SAVE_FILE if iqm file not found + if [ -n "$IQM_FILE" -a -f "$IQM_FILE" ]; then + ETCISL=yes + . $IQM_FILE + elif [ -f "$SAVE_FILE" ]; then + . $SAVE_FILE + fi + + export IQM_TIMEZONE + + # determine action to perform, default is install + upgrade= + removal= + for word in $pkg_keywords + do + case "$word" in + OLD_CUSTOM_UPGRADE) upgrade=nonSSOupgrade + ;; + UPGRADE) upgrade=SSOupgrade + ;; + esac + done + + SMB_DFL=/usr/share/doc/packages/samba/examples/smb.conf.initial + DOC_HOM=AdminHelpTopics/DOShome/DOSgroup/DOS_samba + STORTMP=/tmp/__smb__tmp__ + + # This first case details in which order an "installation" takes place in: + case "$pkg_step" in + PRE_LOAD) + do_preload + ;; + POST_LOAD) + do_postload + ;; + PRE_ATTACH) + do_preattach + ;; + POST_ATTACH) + do_postattach + ;; + PRE_REGISTER) + do_preregister + ;; + POST_REGISTER) + do_postregister + ;; + PRE_CONFIGURE) + do_preconfigure + ;; + POST_CONFIGURE) + do_postconfigure + ;; + PRE_EXPORT) + do_preexport + ;; + POST_EXPORT) + do_postexport + ;; + esac + + # This first case details in which order an "removal" takes place in: + case "$pkg_step" in + PRE_UNEXPORT) + do_preunexport + ;; + POST_UNEXPORT) + do_postunexport + ;; + PRE_UNCONFIGURE) + do_preunconfigure + ;; + POST_UNCONFIGURE) + do_postunconfigure + ;; + PRE_UNREGISTER) + do_preunregister + ;; + POST_UNREGISTER) + do_postunregister + ;; + PRE_UNATTACH) + do_preunattach + ;; + POST_UNATTACH) + do_postunattach + ;; + PRE_UNLOAD) + do_preunload + ;; + POST_UNLOAD) + do_postunload + ;; + esac + + # the directory containing whatever package scripts we've got + pkgscripts=${SSO_SHARED_ROOT}/cntl/packages + + # For each package, run that package's package script with + # the same arguments as this script got. + # Record any exit values from the package scripts. + for scripts in ${pkgscripts}/* + do + [ -x ${scripts}/ccs ] && { + ${scripts}/ccs $* + + # This script exits with the most severe of exit code of any of + # its package scripts. An exit of 1 means "fail", which is more + # severe than an exit of 2, which means "warning". An exit of 0 + # (success) is the least severe. + case "$?" in + 1) ccs_return_value=1 + ;; + 2) [ "$ccs_return_value" -eq 0 ] && ccs_return_value=2 + esac + } + done + + cleanup $OK + *** ./packaging/OSR6/cqs.osr6 Thu Feb 21 11:09:09 2008 --- ./packaging/OSR6/cqs Thu Feb 21 11:07:22 2008 *************** *** 0 **** --- 1,25 ---- + #!/ibin/sh + # + + STORTMP=/tmp/__smb__tmp__ + + rm -rf $STORTMP + [ -d /etc/samba ] && { + [ -d $STORTMP ] || mkdir -p $STORTMP + for i in lmhosts smbfstab smbpasswd smbusers + do + [ -e /etc/samba/$i ] && { + cp -p /etc/samba/$i $STORTMP/$i + } + done + } + [ -e /etc/rc2.d/S99nmbd ] && { + [ -d $STORTMP ] || mkdir -p $STORTMP + touch $STORTMP/nmb_enable + } + [ -e /etc/rc2.d/S99smbd ] && { + [ -d $STORTMP ] || mkdir -p $STORTMP + touch $STORTMP/smb_enable + } + + exit 0 *** ./packaging/OSR6/nmb.init.osr6 Thu Feb 21 11:09:09 2008 --- ./packaging/OSR6/nmb.init Thu Feb 21 11:07:08 2008 *************** *** 0 **** --- 1,60 ---- + #!/bin/sh + # + RCSCRIPT=/etc/rc2.d/S99nmbd + + killproc() { # kill the named process(es) + if [ -f /var/run/samba/$1.pid ] + then + kill `cat /var/run/samba/$1.pid` + else + pid=`/bin/ps -e | + /bin/grep $1 | + /bin/sed -e 's/^ *//' -e 's/ .*//'` + [ "$pid" != "" ] && kill $pid + fi + } + + start() { + # + # Edit these lines to suit your installation (paths, workgroup, host) + # + /usr/sbin/nmbd -D -s /etc/samba/smb.conf + } + + stop() { + killproc nmbd + } + + # Start/stop processes required for samba server + + case "$1" in + + 'start') + start + ;; + 'stop') + stop + ;; + 'restart') + stop + start + ;; + 'enable') + if [ -h $RCSCRIPT ] ; then + echo "nmbd is already enabled." + else + echo "Enabling nmbd ... \c" + rm -f $RCSCRIPT + ln -s /etc/init.d/nmb $RCSCRIPT + echo "Done" + fi + ;; + 'disable') + echo "Disabling nmbd ... \c" + rm -f $RCSCRIPT + echo "Done" + ;; + *) + echo "Usage: /etc/init.d/nmb { start | stop | restart | enable | disable }" + ;; + esac *** ./packaging/OSR6/samba.mkcdmt.osr6 Thu Feb 21 11:09:09 2008 --- ./packaging/OSR6/samba.mkcdmt Thu Feb 21 11:07:51 2008 *************** *** 0 **** --- 1,88 ---- + # + # mkcdmt -f -d `pwd` -P samba -D "Samba - SMB/CIFS fileserver for UNIX" + # -V 3.0.20Dd -p thisfile + + prepare ("Checking and preparing distribution") { + auto_compress_texinfo(); + auto_format_mansource(); + auto_strip(TRUE,TRUE); + } + + package ("/", "${METAPKG_DESCRIPTION}", "SAMBA") + { + directory ("/var/lib/samba") { + export (EXPPHASE); + } + directory ("/var/log/samba") { + export (EXPPHASE); + } + directory ("/var/run/samba") { + export (EXPPHASE); + } + directory ("/var/spool/samba") { + mode (1777); + export (EXPPHASE); + } + file ("/etc/init.d/nmb") { + owner ("bin"); + group ("bin"); + mode (700); + } + file ("/etc/init.d/smb") { + owner ("bin"); + group ("bin"); + mode (700); + } + file ("/etc/init.d/winbind") { + owner ("bin"); + group ("bin"); + mode (700); + } + file ("/etc/samba/smbfstab") { + owner ("bin"); + group ("bin"); + mode (600); + } + file ("/etc/samba/smbpasswd") { + owner ("bin"); + group ("bin"); + mode (600); + } + file ("/usr/share/doc/packages/samba/examples/smb.conf.initial") { + access (CLIENT); + mode (644); + } + file ("/usr/bin/smbspool") { + addexport ("/usr/lib/cups/backend/smb", EXPPHASE); + } + file ("/usr/lib/libsmbclient.so.0") { + addexport ("/usr/lib/libsmbclient.so", EXPPHASE); + } + directory ("/usr/share/doc/packages/samba/htmldocs") { + export (EXPPHASE); + addexport ("/usr/share/samba/swat/help", EXPPHASE); + addexport ("/usr/share/samba/swat/help/manpages", EXPPHASE); + exportok(); + } + directory ("/usr/share/doc/packages/samba/htmldocs/using_samba") { + addexport ("/usr/share/samba/swat/using_samba", EXPPHASE); + exportok(); + } + } + + component ("samba", "${METAPKG_VERSION}", "${METAPKG_DESCRIPTION}") + { + dependency ("SCO:gwxlibs"); + dependency ("SCO:heimdal"); + upgrades("^1.*"); + upgrades("^2.*"); + upgrades("^3\\\\.0.0*"); + upgrades("^3\\\\.0.1*"); + upgrades("^3\\\\.0.2*"); + upgrades("^3\\\\.0.3*"); + upgrades("^3\\\\.0.4*"); + upgrades("^3\\\\.0.5*"); + upgrades("^3\\\\.0.6*"); + upgrades("^3\\\\.0.7*"); + upgrades("^3\\\\.0.8*"); + } *** ./packaging/OSR6/smb.init.osr6 Thu Feb 21 11:09:09 2008 --- ./packaging/OSR6/smb.init Thu Feb 21 11:07:08 2008 *************** *** 0 **** --- 1,60 ---- + #!/bin/sh + # + RCSCRIPT=/etc/rc2.d/S99smbd + + killproc() { # kill the named process(es) + if [ -f /var/run/samba/$1.pid ] + then + kill `cat /var/run/samba/$1.pid` + else + pid=`/bin/ps -e | + /bin/grep $1 | + /bin/sed -e 's/^ *//' -e 's/ .*//'` + [ "$pid" != "" ] && kill $pid + fi + } + + start() { + # + # Edit these lines to suit your installation (paths, workgroup, host) + # + /usr/sbin/smbd -D -s /etc/samba/smb.conf + } + + stop() { + killproc smbd + } + + # Start/stop processes required for samba server + + case "$1" in + + 'start') + start + ;; + 'stop') + stop + ;; + 'restart') + stop + start + ;; + 'enable') + if [ -h $RCSCRIPT ] ; then + echo "Samba is already enabled." + else + echo "Enabling Samba ... \c" + rm -f $RCSCRIPT + ln -s /etc/init.d/smb $RCSCRIPT + echo "Done" + fi + ;; + 'disable') + echo "Disabling Samba ... \c" + rm -f $RCSCRIPT + echo "Done" + ;; + *) + echo "Usage: /etc/init.d/smb { start | stop | restart | enable | disable }" + ;; + esac *** ./packaging/OSR6/winbind.init.osr6 Thu Feb 21 11:09:09 2008 --- ./packaging/OSR6/winbind.init Thu Feb 21 11:07:08 2008 *************** *** 0 **** --- 1,61 ---- + #!/bin/sh + # + + RCSCRIPT=/etc/rc2.d/S99winbind + + killproc() { # kill the named process(es) + if [ -f /var/run/samba/$1.pid ] + then + kill `cat /var/run/samba/$1.pid` + else + pid=`/bin/ps -e | + /bin/grep $1 | + /bin/sed -e 's/^ *//' -e 's/ .*//'` + [ "$pid" != "" ] && kill $pid + fi + } + + start() { + # + # Edit these lines to suit your installation (paths, workgroup, host) + # + /usr/sbin/winbindd + } + + stop() { + killproc winbindd + } + + # Start/stop processes required for samba server + + case "$1" in + + 'start') + start + ;; + 'stop') + stop + ;; + 'restart') + stop + start + ;; + 'enable') + if [ -h $RCSCRIPT ] ; then + echo "Winbind is already enabled." + else + echo "Enabling Winbind ... \c" + rm -f $RCSCRIPT + ln -s /etc/init.d/samba $RCSCRIPT + echo "Done" + fi + ;; + 'disable') + echo "Disabling Winbind ... \c" + rm -f $RCSCRIPT + echo "Done" + ;; + *) + echo "Usage: /etc/init.d/samba { start | stop | restart | enable | disable }" + ;; + esac *** ./source/auth/pass_check.c.osr6 Wed Nov 14 19:15:03 2007 --- ./source/auth/pass_check.c Thu Feb 21 10:07:46 2008 *************** *** 23,28 **** --- 23,38 ---- #include "includes.h" + #ifdef OSR6 + #define AUTH_MAX_PASSWD_LENGTH 80 + #define AUTH_SALT_SIZE 2 + #define AUTH_CLEARTEXT_SEG_CHARS 8 + #define AUTH_CIPHERTEXT_SEG_CHARS 11 + #define AUTH_SEGMENTS(len) ((((int)len)-1)/AUTH_CLEARTEXT_SEG_CHARS+1) + #define AUTH_CIPHERTEXT_SIZE(segments) (AUTH_SALT_SIZE+(segments)*AUTH_CIPHERTEXT_SEG_CHARS+1) + #define AUTH_MAX_PW_SEG (AUTH_MAX_PASSWD_LENGTH/AUTH_CLEARTEXT_SEG_CHARS) + #endif + #undef DBGC_CLASS #define DBGC_CLASS DBGC_AUTH *************** *** 403,409 **** } #endif ! #ifdef OSF1_ENH_SEC /**************************************************************************** an enhanced crypt for OSF1 ****************************************************************************/ --- 413,419 ---- } #endif ! #if defined(OSF1_ENH_SEC) || defined(OSR6) /**************************************************************************** an enhanced crypt for OSF1 ****************************************************************************/ *************** *** 508,514 **** return NT_STATUS_OK; #endif /* WITH_DFS */ ! #ifdef OSF1_ENH_SEC ret = (strcmp(osf1_bigcrypt(password, this_salt), this_crypted) == 0); --- 518,524 ---- return NT_STATUS_OK; #endif /* WITH_DFS */ ! #if defined(OSF1_ENH_SEC) || defined(OSR6) ret = (strcmp(osf1_bigcrypt(password, this_salt), this_crypted) == 0); *** ./source/include/vfs.h.osr6 Wed Nov 14 19:15:03 2007 --- ./source/include/vfs.h Thu Feb 21 10:07:46 2008 *************** *** 574,580 **** #define SMB_VFS_HANDLE_SET_DATA(handle, datap, free_fn, type, ret) { \ if (!(handle)) { \ ! DEBUG(0,("%s() failed to set handle->data!\n",FUNCTION_MACRO)); \ ret; \ } else { \ if ((handle)->free_data) { \ --- 574,580 ---- #define SMB_VFS_HANDLE_SET_DATA(handle, datap, free_fn, type, ret) { \ if (!(handle)) { \ ! DEBUG(0,("%s() failed to set vfs_handle->data!\n",FUNCTION_MACRO)); \ ret; \ } else { \ if ((handle)->free_data) { \ *** ./source/include/local.h.osr6 Wed Nov 14 19:15:03 2007 --- ./source/include/local.h Thu Feb 21 10:07:46 2008 *************** *** 98,104 **** /* the default guest account - normally set in the Makefile or smb.conf */ #ifndef GUEST_ACCOUNT ! #define GUEST_ACCOUNT "nobody" #endif /* user to test password server with as invalid in security=server mode. */ --- 98,104 ---- /* the default guest account - normally set in the Makefile or smb.conf */ #ifndef GUEST_ACCOUNT ! #define GUEST_ACCOUNT "nouser" #endif /* user to test password server with as invalid in security=server mode. */ *** ./source/lib/charcnv.c.osr6 Tue Nov 20 19:58:01 2007 --- ./source/lib/charcnv.c Thu Feb 21 10:07:46 2008 *************** *** 71,77 **** setlocale(LC_ALL, ""); #endif ln = nl_langinfo(CODESET); ! if (ln) { /* Check whether the charset name is supported by iconv */ smb_iconv_t handle = smb_iconv_open(ln,"UCS-2LE"); --- 71,77 ---- setlocale(LC_ALL, ""); #endif ln = nl_langinfo(CODESET); ! if (ln && ln[0] != '\0') { /* Check whether the charset name is supported by iconv */ smb_iconv_t handle = smb_iconv_open(ln,"UCS-2LE"); *** ./source/lib/time.c.osr6 Wed Nov 14 19:15:03 2007 --- ./source/lib/time.c Thu Feb 21 10:07:46 2008 *************** *** 872,878 **** return ret; #else #if defined(HAVE_STAT_ST_ATIM) ! return pst->st_atim; #elif defined(HAVE_STAT_ST_ATIMENSEC) struct timespec ret; ret.tv_sec = pst->st_atime; --- 872,878 ---- return ret; #else #if defined(HAVE_STAT_ST_ATIM) ! return pst->st_atim.st__tim; #elif defined(HAVE_STAT_ST_ATIMENSEC) struct timespec ret; ret.tv_sec = pst->st_atime; *************** *** 891,897 **** pst->st_atime = ts.tv_sec; #else #if defined(HAVE_STAT_ST_ATIM) ! pst->st_atim = ts; #elif defined(HAVE_STAT_ST_ATIMENSEC) pst->st_atime = ts.tv_sec; pst->st_atimensec = ts.tv_nsec --- 891,897 ---- pst->st_atime = ts.tv_sec; #else #if defined(HAVE_STAT_ST_ATIM) ! pst->st_atim.st__tim = ts; #elif defined(HAVE_STAT_ST_ATIMENSEC) pst->st_atime = ts.tv_sec; pst->st_atimensec = ts.tv_nsec *************** *** 912,918 **** return ret; #else #if defined(HAVE_STAT_ST_MTIM) ! return pst->st_mtim; #elif defined(HAVE_STAT_ST_MTIMENSEC) struct timespec ret; ret.tv_sec = pst->st_mtime; --- 912,918 ---- return ret; #else #if defined(HAVE_STAT_ST_MTIM) ! return pst->st_mtim.st__tim; #elif defined(HAVE_STAT_ST_MTIMENSEC) struct timespec ret; ret.tv_sec = pst->st_mtime; *************** *** 931,937 **** pst->st_mtime = ts.tv_sec; #else #if defined(HAVE_STAT_ST_MTIM) ! pst->st_mtim = ts; #elif defined(HAVE_STAT_ST_MTIMENSEC) pst->st_mtime = ts.tv_sec; pst->st_mtimensec = ts.tv_nsec --- 931,937 ---- pst->st_mtime = ts.tv_sec; #else #if defined(HAVE_STAT_ST_MTIM) ! pst->st_mtim.st__tim = ts; #elif defined(HAVE_STAT_ST_MTIMENSEC) pst->st_mtime = ts.tv_sec; pst->st_mtimensec = ts.tv_nsec *************** *** 952,958 **** return ret; #else #if defined(HAVE_STAT_ST_CTIM) ! return pst->st_ctim; #elif defined(HAVE_STAT_ST_CTIMENSEC) struct timespec ret; ret.tv_sec = pst->st_ctime; --- 952,958 ---- return ret; #else #if defined(HAVE_STAT_ST_CTIM) ! return pst->st_ctim.st__tim; #elif defined(HAVE_STAT_ST_CTIMENSEC) struct timespec ret; ret.tv_sec = pst->st_ctime; *************** *** 971,977 **** pst->st_ctime = ts.tv_sec; #else #if defined(HAVE_STAT_ST_CTIM) ! pst->st_ctim = ts; #elif defined(HAVE_STAT_ST_CTIMENSEC) pst->st_ctime = ts.tv_sec; pst->st_ctimensec = ts.tv_nsec --- 971,977 ---- pst->st_ctime = ts.tv_sec; #else #if defined(HAVE_STAT_ST_CTIM) ! pst->st_ctim.st__tim = ts; #elif defined(HAVE_STAT_ST_CTIMENSEC) pst->st_ctime = ts.tv_sec; pst->st_ctimensec = ts.tv_nsec *** ./source/nsswitch/winbind_nss.h.osr6 Wed Nov 14 19:15:04 2007 --- ./source/nsswitch/winbind_nss.h Thu Feb 21 10:07:46 2008 *************** *** 66,71 **** --- 66,76 ---- #else /* Nothing's defined. Neither gnu nor netbsd nor sun nor hp */ + #include "nss.h" + typedef enum nss_status NSS_STATUS; + + /* + typedef enum { NSS_STATUS_SUCCESS=0, *************** *** 73,78 **** --- 78,84 ---- NSS_STATUS_UNAVAIL=2, NSS_STATUS_TRYAGAIN=3 } NSS_STATUS; + */ #endif *** ./source/nsswitch/wb_common.c.osr6 Wed Nov 14 19:15:04 2007 --- ./source/nsswitch/wb_common.c Thu Feb 21 10:07:46 2008 *************** *** 253,259 **** ret = select(fd + 1, NULL, &w_fds, NULL, &tv); if (ret > 0) { ! errnosize = sizeof(connect_errno); ret = getsockopt(fd, SOL_SOCKET, SO_ERROR, &connect_errno, &errnosize); --- 253,259 ---- ret = select(fd + 1, NULL, &w_fds, NULL, &tv); if (ret > 0) { ! errnosize = (socklen_t)sizeof(connect_errno); ret = getsockopt(fd, SOL_SOCKET, SO_ERROR, &connect_errno, &errnosize); *** ./source/nsswitch/nss.h.osr6 Thu Feb 21 10:07:46 2008 --- ./source/nsswitch/nss.h Thu Feb 21 10:07:46 2008 *************** *** 0 **** --- 1,58 ---- + /*- + * Copyright (c) 2003 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by + * Jacques A. Vidrine, Safeport Network Services, and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: /repoman/r/ncvs/src/include/nss.h,v 1.2 2004/01/09 13:43:49 nectar Exp $ + * + * Compatibility header for the GNU C Library-style nsswitch interface. + */ + #ifndef _NSS_H_ + #define _NSS_H_ + + #include + + enum nss_status { + NSS_STATUS_TRYAGAIN = -2, + NSS_STATUS_UNAVAIL, + NSS_STATUS_NOTFOUND, + NSS_STATUS_SUCCESS, + NSS_STATUS_RETURN + }; + + #define __nss_compat_result(rv, err) \ + ((rv == NSS_STATUS_TRYAGAIN && err == ERANGE) ? NS_RETURN : \ + (rv == NSS_STATUS_TRYAGAIN) ? NS_TRYAGAIN : \ + (rv == NSS_STATUS_UNAVAIL) ? NS_UNAVAIL : \ + (rv == NSS_STATUS_NOTFOUND) ? NS_NOTFOUND : \ + (rv == NSS_STATUS_SUCCESS) ? NS_SUCCESS : \ + (rv == NSS_STATUS_RETURN) ? NS_RETURN : 0) + + #endif + *** ./source/nsswitch/nss_compat.c.osr6 Thu Feb 21 10:07:46 2008 --- ./source/nsswitch/nss_compat.c Thu Feb 21 11:21:41 2008 *************** *** 0 **** --- 1,270 ---- + /*- + * Copyright (c) 2003 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by + * Jacques A. Vidrine, Safeport Network Services, and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * Compatibility shims for the GNU C Library-style nsswitch interface. + */ + #include + //__FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/net/nss_compat.c,v 1.3 2004/03/30 15:56:15 nectar Exp $"); + + //#include "namespace.h" + #include + #include + #include "nss.h" + #include + #include "nsswitch.h" + //#include + //#include + //#include "un-namespace.h" + //#include "libc_private.h" + + + struct group; + struct passwd; + + //static int terminator; + + /*#define DECLARE_TERMINATOR(x) \ + //static pthread_key_t _term_key_##x; \ + //static void \ + //_term_create_##x(void) \ + //{ \ + // (void)_pthread_key_create(&_term_key_##x, NULL); \ + //} \ + //static void *_term_main_##x; \ + //static pthread_once_t _term_once_##x = PTHREAD_ONCE_INIT + + //#define SET_TERMINATOR(x, y) \ + //do { \ + // if (!__isthreaded || _pthread_main_np()) \ + // _term_main_##x = (y); \ + // else { \ + // (void)_pthread_once(&_term_once_##x, _term_create_##x); \ + // (void)_pthread_setspecific(_term_key_##x, y); \ + // } \ + } while (0) + // + //#define CHECK_TERMINATOR(x) \ + //(!__isthreaded || _pthread_main_np() ? \ + // (_term_main_##x) : \ + // ((void)_pthread_once(&_term_once_##x, _term_create_##x), \ + // _pthread_getspecific(_term_key_##x))) + + + + //DECLARE_TERMINATOR(group);*/ + + int __nss_compat_getgrnam_r(void *retval, void *mdata, va_list ap) + { + int (*fn)(const char *, struct group *, char *, size_t, int *); + const char *name; + struct group *grp; + char *buffer; + int *errnop; + size_t bufsize; + enum nss_status status; + + fn = (int (*)())mdata; + name = va_arg(ap, const char *); + grp = va_arg(ap, struct group *); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + status = fn(name, grp, buffer, bufsize, errnop); + status = __nss_compat_result(status, *errnop); + if (status == NS_SUCCESS) + *(struct group **)retval = grp; + return (status); + } + + + int __nss_compat_getgrgid_r(void *retval, void *mdata, va_list ap) + { + int (*fn)(gid_t, struct group *, char *, size_t, int *); + gid_t gid; + struct group *grp; + char *buffer; + int *errnop; + size_t bufsize; + enum nss_status status; + + fn = (int (*)())mdata; + gid = va_arg(ap, gid_t); + grp = va_arg(ap, struct group *); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + status = fn(gid, grp, buffer, bufsize, errnop); + status = __nss_compat_result(status, *errnop); + if (status == NS_SUCCESS) + *(struct group **)retval = grp; + return (status); + } + + + int __nss_compat_getgrent_r(void *retval, void *mdata, va_list ap) + { + int (*fn)(struct group *, char *, size_t, int *); + struct group *grp; + char *buffer; + int *errnop; + size_t bufsize; + enum nss_status status; + + //if (CHECK_TERMINATOR(group)) + // return (NS_NOTFOUND); + fn = (int (*)())mdata; + grp = va_arg(ap, struct group *); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + status = fn(grp, buffer, bufsize, errnop); + status = __nss_compat_result(status, *errnop); + if (status == NS_SUCCESS) + *(struct group **)retval = grp; + //else if (status != NS_RETURN) + // SET_TERMINATOR(group, &terminator); + return (status); + } + + + int __nss_compat_setgrent(void *retval, void *mdata, va_list ap) + { + + //SET_TERMINATOR(group, NULL); + ((int (*)(void))mdata)(); + return (NS_UNAVAIL); + } + + + int __nss_compat_endgrent(void *retval, void *mdata, va_list ap) + { + + //SET_TERMINATOR(group, NULL); + ((int (*)(void))mdata)(); + return (NS_UNAVAIL); + } + + + + //DECLARE_TERMINATOR(passwd); + + + int __nss_compat_getpwnam_r(void *retval, void *mdata, va_list ap) + { + int (*fn)(const char *, struct passwd *, char *, size_t, int *); + const char *name; + struct passwd *pwd; + char *buffer; + int *errnop; + size_t bufsize; + enum nss_status status; + + fn = (int (*)())mdata; + name = va_arg(ap, const char *); + pwd = va_arg(ap, struct passwd *); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + status = fn(name, pwd, buffer, bufsize, errnop); + status = __nss_compat_result(status, *errnop); + if (status == NS_SUCCESS) + *(struct passwd **)retval = pwd; + return (status); + } + + + int __nss_compat_getpwuid_r(void *retval, void *mdata, va_list ap) + { + int (*fn)(uid_t, struct passwd *, char *, size_t, int *); + uid_t uid; + struct passwd *pwd; + char *buffer; + int *errnop; + size_t bufsize; + enum nss_status status; + + fn = (int (*)())mdata; + uid = va_arg(ap, uid_t); + pwd = va_arg(ap, struct passwd *); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + status = fn(uid, pwd, buffer, bufsize, errnop); + status = __nss_compat_result(status, *errnop); + if (status == NS_SUCCESS) + *(struct passwd **)retval = pwd; + return (status); + } + + + int __nss_compat_getpwent_r(void *retval, void *mdata, va_list ap) + { + int (*fn)(struct passwd *, char *, size_t, int *); + struct passwd *pwd; + char *buffer; + int *errnop; + size_t bufsize; + enum nss_status status; + + //if (CHECK_TERMINATOR(passwd)) + // return (NS_NOTFOUND); + fn = (int (*)())mdata; + pwd = va_arg(ap, struct passwd *); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + status = fn(pwd, buffer, bufsize, errnop); + status = __nss_compat_result(status, *errnop); + if (status == NS_SUCCESS) + *(struct passwd **)retval = pwd; + //else if (status != NS_RETURN) + // SET_TERMINATOR(passwd, &terminator); + return (status); + } + + + int __nss_compat_setpwent(void *retval, void *mdata, va_list ap) + { + + //SET_TERMINATOR(passwd, NULL); + ((int (*)(void))mdata)(); + return (NS_UNAVAIL); + } + + + int __nss_compat_endpwent(void *retval, void *mdata, va_list ap) + { + + //SET_TERMINATOR(passwd, NULL); + ((int (*)(void))mdata)(); + return (NS_UNAVAIL); + } + *** ./source/nsswitch/winbind_nss_uw7.c.osr6 Thu Feb 21 10:07:46 2008 --- ./source/nsswitch/winbind_nss_uw7.c Thu Feb 21 11:23:48 2008 *************** *** 0 **** --- 1,225 ---- + /* + Unix SMB/CIFS implementation. + + AIX loadable authentication module, providing identification + routines against Samba winbind/Windows NT Domain + + Copyright (C) Aaron Collins 2003 + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + */ + + #include "winbind_client.h" + #include + #include + #include + + + #define NSDB_GROUP "group" + #define NSDB_PASSWD "passwd" + + #define NSS_METHOD_PROTOTYPE(method) \ + int method(void *, void *, va_list) + + /* Make sure that the module gets registered needed by freebsd 5.1 */ + + extern enum nss_status _nss_winbind_getgrent_r(struct group *, char *, size_t, + int *); + extern enum nss_status _nss_winbind_getgrnam_r(const char *, struct group *, + char *, size_t, int *); + extern enum nss_status _nss_winbind_getgrgid_r(gid_t gid, struct group *, char *, + size_t, int *); + extern enum nss_status _nss_winbind_setgrent(void); + extern enum nss_status _nss_winbind_endgrent(void); + + extern enum nss_status _nss_winbind_getpwent_r(struct passwd *, char *, size_t, + int *); + extern enum nss_status _nss_winbind_getpwnam_r(const char *, struct passwd *, + char *, size_t, int *); + extern enum nss_status _nss_winbind_getpwuid_r(gid_t gid, struct passwd *, char *, + size_t, int *); + extern enum nss_status _nss_winbind_setpwent(void); + extern enum nss_status _nss_winbind_endpwent(void); + + NSS_METHOD_PROTOTYPE(__nss_compat_getgrnam_r); + NSS_METHOD_PROTOTYPE(__nss_compat_getgrgid_r); + NSS_METHOD_PROTOTYPE(__nss_compat_getgrent_r); + NSS_METHOD_PROTOTYPE(__nss_compat_setgrent); + NSS_METHOD_PROTOTYPE(__nss_compat_endgrent); + + NSS_METHOD_PROTOTYPE(__nss_compat_getpwnam_r); + NSS_METHOD_PROTOTYPE(__nss_compat_getpwuid_r); + NSS_METHOD_PROTOTYPE(__nss_compat_getpwent_r); + NSS_METHOD_PROTOTYPE(__nss_compat_setpwent); + NSS_METHOD_PROTOTYPE(__nss_compat_endpwent); + + NSS_METHOD_PROTOTYPE(_nss_winbind_openinfo); + + static ns_mtab methods[] = { + { NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, (void *) _nss_winbind_getgrnam_r }, + { NSDB_GROUP, "getgrgid_r", __nss_compat_getgrgid_r, (void *) _nss_winbind_getgrgid_r }, + { NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, (void *) _nss_winbind_getgrent_r }, + { NSDB_GROUP, "setgrent", __nss_compat_setgrent, (void *) _nss_winbind_setgrent }, + { NSDB_GROUP, "endgrent", __nss_compat_endgrent, (void *) _nss_winbind_endgrent }, + + { NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, (void *) _nss_winbind_getpwnam_r }, + { NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, (void *) _nss_winbind_getpwuid_r }, + { NSDB_PASSWD, "getpwent_r", __nss_compat_getpwent_r, (void *) _nss_winbind_getpwent_r }, + { NSDB_PASSWD, "setpwent", __nss_compat_setpwent, (void *) _nss_winbind_setpwent }, + { NSDB_PASSWD, "endpwent", __nss_compat_endpwent, (void *) _nss_winbind_endpwent }, + + { "iaf", "ia_openinfo", _nss_winbind_openinfo, 0}, + }; + + ns_mtab * + nss_module_register(const char *source, unsigned int *mtabsize, + nss_module_unregister_fn *unreg) + { + *mtabsize = sizeof(methods)/sizeof(methods[0]); + *unreg = NULL; + return (methods); + } + + /* int ia_openinfo(const char * logname, uinfo_t * uinfo); */ + int + _nss_winbind_openinfo(void *rv, void *mdata, va_list ap) + { + const char *name; + struct passwd p; + struct group grp, *gr; + char buf[512], grbuf[128]; + enum nss_status status; + int err, dlen, slen, grlen; + gid_t *gp, smlist[32]; /* usually long enough */ + int *ret = rv; + uinfo_t *uipp; + char *grptr; + uinfo_t uip; + long n, max; + + name = va_arg(ap, const char *); + uipp = va_arg(ap, uinfo_t *); + + *uipp = 0; + + status = _nss_winbind_getpwnam_r(name, &p, buf, 512, &err); + status = __nss_compat_result(status, err); + + if (status != NS_SUCCESS) { + return status; + } + + /* Fill gp[] with all GIDs associated with p.pw_name. */ + if ((max = sysconf(_SC_NGROUPS_MAX)) <= 0) { + usesm:; + max = sizeof(smlist) / sizeof(gid_t); + gp = smlist; + } else if (max <= sizeof(smlist) / sizeof(gid_t)) { + gp = smlist; + } else if ((gp = malloc(max * sizeof(gid_t))) == 0) { + goto usesm; + } + n = 0; + if (p.pw_gid >= 0) + gp[n++] = p.pw_gid; + setgrent(); + grptr = grbuf; + grlen = sizeof(grbuf); + /* + * Walk through the /etc/group file (and other module's + * variants) filling in the supplemental GIDs. Loop here + * until reach EOF or, when the buffer is too short, + * retry the current entry. + */ + for (;;) { + err = getgrent_r(&grp, grptr, grlen, &gr); + if (gr != 0) { + if (n >= max) /* no more room for GIDs */ + break; + if (grp.gr_gid == p.pw_gid) /* skip primary group */ + continue; + while (*grp.gr_mem != 0) { + if (strcmp(*grp.gr_mem, p.pw_name) == 0) { + gp[n++] = grp.gr_gid; + break; + } + grp.gr_mem++; + } + continue; + } + if (err == ERANGE) { + if (grptr != grbuf) + free(grptr); + grlen <<= 1; + if ((grptr = malloc(grlen)) != 0) + continue; + } + break; + } + endgrent(); + if (err != 0) { + status = NS_TRYAGAIN; + goto out; + } + + /* Now calculate the space needed for result struct */ + max = n; + dlen = strlen(p.pw_dir); + slen = strlen(p.pw_shell); + + /* struct + max groups + dir + shell */ + n = sizeof(*uip) + max * sizeof(gid_t) + dlen + 1 + slen + 1; + + if ((uip = malloc(n)) == NULL) { + status = NS_TRYAGAIN; + goto out; + } + + bzero(uip, n); + + strncpy(uip->ia_name, p.pw_name, sizeof(uip->ia_name)); + strncpy(uip->ia_pwdp, p.pw_passwd, sizeof(uip->ia_pwdp)); + uip->ia_uid = p.pw_uid; + uip->ia_gid = p.pw_gid; + uip->ia_lstchg = -1; + uip->ia_min = -1; + uip->ia_max = -1; + uip->ia_warn = -1; + uip->ia_inact = -1; + uip->ia_expire = -1; + uip->ia_flag = 0; + uip->ia_dirsz = dlen; + uip->ia_shsz = slen; + uip->ia_lvlcnt = 0; + uip->ia_sgidcnt = max; + + uip->ia_lvlp = (level_t *)&uip[1]; + uip->ia_sgidp = (gid_t *)&uip[1]; + uip->ia_dirp = (char *)&uip->ia_sgidp[max]; + uip->ia_shellp = &uip->ia_dirp[dlen + 1]; + memcpy(uip->ia_sgidp, gp, max * sizeof(gid_t)); + strcpy(uip->ia_dirp, p.pw_dir); + strcpy(uip->ia_shellp, p.pw_shell); + + *ret = 0; + *uipp = uip; + out:; + if (gp != smlist) + free(gp); + if (grptr != grbuf) + free(grptr); + return status; + } *** ./source/nsswitch/winbindd_dual.c.osr6 Wed Nov 14 19:15:04 2007 --- ./source/nsswitch/winbindd_dual.c Thu Feb 21 12:20:44 2008 *************** *** 883,889 **** struct winbindd_cli_state state; struct winbindd_domain *domain; ! if (socketpair(AF_UNIX, SOCK_STREAM, 0, fdpair) != 0) { DEBUG(0, ("Could not open child pipe: %s\n", strerror(errno))); return False; --- 883,889 ---- struct winbindd_cli_state state; struct winbindd_domain *domain; ! if (socketpair(AF_UNIX, SOCK_STREAM, 0, fdpair) == -1) { DEBUG(0, ("Could not open child pipe: %s\n", strerror(errno))); return False; *** ./source/param/loadparm.c.osr6 Wed Nov 14 19:15:04 2007 --- ./source/param/loadparm.c Thu Feb 21 12:22:21 2008 *************** *** 1627,1641 **** Globals.bAllowTrustedDomains = True; string_set(&Globals.szTemplateShell, "/bin/false"); ! string_set(&Globals.szTemplateHomedir, "/home/%D/%U"); string_set(&Globals.szWinbindSeparator, "\\"); string_set(&Globals.szCupsServer, ""); string_set(&Globals.szIPrintServer, ""); Globals.winbind_cache_time = 300; /* 5 minutes */ ! Globals.bWinbindEnumUsers = False; ! Globals.bWinbindEnumGroups = False; Globals.bWinbindUseDefaultDomain = False; Globals.bWinbindTrustedDomainsOnly = False; Globals.bWinbindNestedGroups = True; --- 1627,1641 ---- Globals.bAllowTrustedDomains = True; string_set(&Globals.szTemplateShell, "/bin/false"); ! string_set(&Globals.szTemplateHomedir, "/u/%D/%U"); string_set(&Globals.szWinbindSeparator, "\\"); string_set(&Globals.szCupsServer, ""); string_set(&Globals.szIPrintServer, ""); Globals.winbind_cache_time = 300; /* 5 minutes */ ! Globals.bWinbindEnumUsers = True; ! Globals.bWinbindEnumGroups = True; Globals.bWinbindUseDefaultDomain = False; Globals.bWinbindTrustedDomainsOnly = False; Globals.bWinbindNestedGroups = True; *** ./source/script/installswat.sh.osr6 Wed Nov 14 19:15:04 2007 --- ./source/script/installswat.sh Thu Feb 21 10:07:46 2008 *************** *** 175,180 **** --- 175,181 ---- fi fi for f in $SRCDIR../docs/$dir/images/*.png; do + if [ "$f" = "$SRCDIR../docs/$dir/images/*.png" ]; then break; fi FNAME=$INSTALLDIR/images/`basename $f` echo $FNAME if test "$mode" = 'install'; then *** ./source/tdb/include/tdb.h.osr6 Tue Nov 20 19:58:01 2007 --- ./source/tdb/include/tdb.h Thu Feb 21 10:07:46 2008 *************** *** 31,36 **** --- 31,37 ---- extern "C" { #endif + #include /* flags to tdb_store() */ #define TDB_REPLACE 1 *** ./source/tdb/include/tdbconfig.h.in.osr6 Wed Nov 14 19:15:04 2007 --- ./source/tdb/include/tdbconfig.h.in Thu Feb 21 10:07:46 2008 *************** *** 56,58 **** --- 56,62 ---- /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS + + #ifdef __USLC__ + #define HAVE_FTRUNCATE 1 + #endif *** ./source/tdb/tools/tdbtorture.c.osr6 Wed Nov 14 19:15:04 2007 --- ./source/tdb/tools/tdbtorture.c Thu Feb 21 10:07:46 2008 *************** *** 12,17 **** --- 12,18 ---- #include #endif + #include #define REOPEN_PROB 30 #define DELETE_PROB 8 *** ./source/web/swat.c.osr6 Wed Nov 14 19:15:04 2007 --- ./source/web/swat.c Thu Feb 21 12:27:28 2008 *************** *** 893,898 **** --- 893,899 ---- if (cgi_variable("Commit") && snum >= 0) { commit_parameters(snum); save_reload(0); + snum = lp_servicenumber(share); } if (cgi_variable("Delete") && snum >= 0) { *** ./source/configure.in.osr6 Tue Nov 20 19:58:01 2007 --- ./source/configure.in Thu Feb 21 10:07:46 2008 *************** *** 1003,1011 **** ], samba_cv_optimize_out_funcation_calls=yes,samba_cv_optimize_out_funcation_calls=no)]) ! if test x"$samba_cv_optimize_out_funcation_calls" = x"yes"; then ! AC_DEFINE(HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS,1,[Whether the compiler will optimize out function calls]) ! fi ############################################ # check for unix domain sockets --- 1003,1011 ---- ], samba_cv_optimize_out_funcation_calls=yes,samba_cv_optimize_out_funcation_calls=no)]) ! #if test x"$samba_cv_optimize_out_funcation_calls" = x"yes"; then ! # AC_DEFINE(HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS,1,[Whether the compiler will optimize out function calls]) ! #fi ############################################ # check for unix domain sockets *************** *** 1817,1827 **** *sco*) AC_DEFINE(SCO,1,[Whether the host os is sco unix]) AC_DEFINE(STAT_ST_BLOCKSIZE,512) ;; ! *unixware*) AC_DEFINE(UNIXWARE,1,[Whether the host os is unixware]) BLDSHARED="true" ! LDSHFLAGS="-shared" ! SONAMEFLAG="-Wl,-soname," PICFLAG="-KPIC" AC_DEFINE(STAT_ST_BLOCKSIZE,512) ;; *next2*) AC_DEFINE(NEXT2,1,[Whether the host os is NeXT v2]) --- 1817,1833 ---- *sco*) AC_DEFINE(SCO,1,[Whether the host os is sco unix]) AC_DEFINE(STAT_ST_BLOCKSIZE,512) ;; ! *unixware*|*UnixWare*|*sysv5*) BLDSHARED="true" ! LDSHFLAGS="-G" ! DYNEXP="-Wl,-Bexport" ! SONAMEFLAG="-Wl,-h," ! PICFLAGS="-KPIC" PICFLAG="-KPIC" + AC_DEFINE(UNIXWARE,1,[Whether the host os is unixware]) + AC_DEFINE(SYSV,1,[Whether this is a system V system]) + AC_DEFINE(HAVE_MEMSET,1,[Whether memset() is available]) + AC_DEFINE(STAT_ST_BLOCKSIZE,512) AC_DEFINE(STAT_ST_BLOCKSIZE,512) ;; *next2*) AC_DEFINE(NEXT2,1,[Whether the host os is NeXT v2]) *************** *** 1843,1855 **** AC_DEFINE(STAT_ST_BLOCKSIZE,512) ;; - *sysv5*) AC_DEFINE(SYSV,1,[Whether this is a system V system]) - if [ test "$GCC" != yes ]; then - AC_DEFINE(HAVE_MEMSET,1,[Whether memset() is available]) - fi - LDSHFLAGS="-G" - AC_DEFINE(STAT_ST_BLOCKSIZE,512) - ;; *vos*) AC_DEFINE(STAT_ST_BLOCKSIZE,4096) BLDSHARED="false" LDSHFLAGS="" --- 1849,1854 ---- *************** *** 5133,5142 **** yes) case "$host_os" in ! *sysv5*) AC_MSG_RESULT(Using UnixWare ACLs) AC_DEFINE(HAVE_UNIXWARE_ACLS,1,[Whether UnixWare ACLs are available]) - default_static_modules="$default_static_modules vfs_solarisacl" ;; *solaris*) AC_MSG_RESULT(Using solaris ACLs) --- 5132,5140 ---- yes) case "$host_os" in ! *unixware*|*UnixWare*|*sysv5*) AC_MSG_RESULT(Using UnixWare ACLs) AC_DEFINE(HAVE_UNIXWARE_ACLS,1,[Whether UnixWare ACLs are available]) ;; *solaris*) AC_MSG_RESULT(Using solaris ACLs) *************** *** 5770,5775 **** --- 5768,5781 ---- nsswitch/winbind_nss_linux.o" WINBIND_NSS_EXTRA_LIBS="-lsocket" ;; + *unixware*|*sysv5*|*UnixWare*) + # UW714+ winbind client is implemented as a wrapper around + # the Linux version. + WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_uw7.o \ + nsswitch/nss_compat.o \ + nsswitch/winbind_nss_linux.o" + WINBIND_NSS_EXTA_LIBS="-lsocket -lnsl" + ;; *hpux11*) WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_solaris.o" ;; *** ./source/config.guess.osr6 Wed Nov 14 19:15:03 2007 --- ./source/config.guess Thu Feb 21 10:07:46 2008 *************** *** 1023,1028 **** --- 1023,1033 ---- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit ;; + i*86:5:UnixWare:7.*) + # Additional variants of Unixware. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit 0 ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *** ./source/Makefile.in.osr6 Wed Nov 14 19:15:03 2007 --- ./source/Makefile.in Thu Feb 21 10:07:46 2008 *************** *** 130,136 **** FLAGS3 = FLAGS4 = FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) ! FLAGS = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3 PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\" PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" --- 130,136 ---- FLAGS3 = FLAGS4 = FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) ! FLAGS = $(ISA) $(FLAGS5) -I$(srcdir)/lib -I$(srcdir)/librpc -D_SAMBA_BUILD_=3 PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\" PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" *************** *** 1367,1373 **** bin/CP850.@SHLIBEXT@: proto_exists $(CP850_OBJ) @echo "Building plugin $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(CP850_OBJ) \ ! @SONAMEFLAG@`basename $@` bin/CP437.@SHLIBEXT@: proto_exists $(CP437_OBJ) @echo "Building plugin $@" --- 1367,1373 ---- bin/CP850.@SHLIBEXT@: proto_exists $(CP850_OBJ) @echo "Building plugin $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(CP850_OBJ) \ ! @SONAMEFLAG@`basename $@` -L./bin -lsmbclient bin/CP437.@SHLIBEXT@: proto_exists $(CP437_OBJ) @echo "Building plugin $@" *** ./Build-OSR6.osr6 Thu Feb 21 10:07:47 2008 --- ./Build-OSR6 Thu Feb 21 11:27:27 2008 *************** *** 0 **** --- 1,145 ---- + #!/bin/sh + # + HOST=i586-sco-sysv5 + INSTALL=/usr/gnu/bin/install + PDIR=/u/src/sco/patches + NM="nm -p" + M4=/usr/gnu/bin/m4 + export NM M4 INSTALL + CC=cc + CXX=CC + CFLAGS="-Kthread -Kalloca -O2 -D_GNU_SOURCE -D_LARGEFILE64_SOURCE" + CXXFLAGS="$CFLAGS" + XML2_CONFIG=/usr/bin/xml2-config + export CC CXX CFLAGS CXXFLAGS XML2_CONFIG + RANLIB=true + VISUAL= + CUPS_CONFIG=/usr/bin/cups-config + MAKE=/usr/gnu/bin/make + export RANLIB VISUAL CUPS_CONFIG MAKE + # make sure we have a chance to find krb5-config + PATH="$PATH:/usr/lib/heimdal/bin" + export PATH + + VENDOR_FILES=`pwd`/../vendor-files.tar.bz2 + + vscan_ver=0.3.6b + VSCAN_SRC=`pwd`/../vscan-$vscan_ver.tar.bz2 + export VSCAN_SRC + + defaultdocdir=/usr/share/doc/packages + name=samba + datadir=/usr/share + localstatedir=/var + libdir=/usr/lib + sbindir=/usr/sbin + mandir=/usr/man + sysconfdir=/etc + DOCDIR=${defaultdocdir}/${name} + DOCBOOKDIR=${defaultdocdir}/${name}/docbook + SWATDIR=${datadir}/samba/swat + LOGDIR=${localstatedir}/log/samba + LIBDIR=${libdir}/samba + LOCKDIR=${localstatedir}/lib/samba + CONFIGDIR=${sysconfdir}/samba + INITDIR=${sysconfdir}/init.d + PIDDIR=${localstatedir}/lib/samba + SPOOLDIR=${localstatedir}/spool/samba + + [ -f $VENDOR_FILES ] && bzcat $VENDOR_FILES | tar xf - + + [ -f $VSCAN_SRC ] && { + (cd examples/VFS; bzcat $VSCAN_SRC | tar xf -) + [ -f ${PDIR}/vscan-$vscan_ver-osr6.patch ] && { + /usr/gnu/bin/patch -b -z .osr6 -p0 -i $PDIR/vscan-$vscan_ver-osr6.patch + } + } + + # + # Compiler can optimize out function calls but smbd/msdfs.c has a bad + # optimize, so turn it off. + # + # TODO + # Try to fix smbd/msdfs.c. + # + samba_cv_optimize_out_funcation_calls=no + export samba_cv_optimize_out_funcation_calls + + cd source + ./autogen.sh + rm -f ../mout-configure + CONFIGURE_OPTIONS="--prefix=/usr \ + --cache-file=/dev/null \ + --sysconfdir=/etc \ + --sbindir=${sbindir} \ + --localstatedir=${LOCKDIR} \ + --with-libdir=/usr/lib/samba \ + --with-configdir=/etc/samba \ + --with-logfilebase=/var/log/samba \ + --with-privatedir=/etc/samba/private \ + --with-lockdir=/var/lib/samba \ + --with-piddir=/var/lib/samba \ + --with-swatdir=/usr/share/samba/swat \ + --enable-cups \ + --without-acl-support \ + --with-automount \ + --with-msdfs \ + --without-quotas \ + --without-smbmount \ + --with-tdbsam \ + --with-vfs \ + --with-shared-modules=idmap_rid \ + --with-expsam=xml,mysql,pgsql \ + --disable-iprint \ + --with-mandir=/usr/man \ + --with-libiconv=/usr \ + --with-ldap \ + --with-includedir=/usr/lib \ + --with-krb5=/usr/lib/heimdal \ + --with-ads \ + --without-pam \ + --without-pam_smbpass \ + --with-syslog \ + --with-utmp \ + --with-libsmbclient \ + --with-winbind \ + --host=$HOST --target=$HOST --build=$HOST" + # --with-included-popt + + ./configure $CONFIGURE_OPTIONS 2>&1 | tee ../mout-configure + + $MAKE proto 2>&1 | tee ../mout-proto + $MAKE all \ + torture \ + wins \ + libsmbclient \ + everything \ + modules \ + talloctort \ + bin/smbget 2>&1 | tee ../mout + cd tdb + sh -x autogen.sh + ./configure --host=$HOST --target=$HOST --build=$HOST 2>&1 | \ + tee ../../mout-configure-tdb + #$MAKE -C tdb tdbdump tdbtest tdbtool tdbtorture 2>&1 | tee ../mout-tdb + echo " + #ifdef __USLC__ + #define HAVE_FTRUNCATE 1 + #endif" >> include/config.h + + $MAKE 2>&1 | tee ../../mout-tdb + # make smbsh in libsmbclient/smbwrapper + $MAKE -C ../../examples/libsmbclient/smbwrapper 2>&1 | tee ../../mout-smbsh + # make examples in VFS + cd ../../examples/VFS + sh -x autogen.sh + CFLAGS="$CFLAGS -KPIC" ./configure ${CONFIGURE_OPTIONS} 2>&1 | \ + tee ../../mout-configure-VFS + $MAKE 2>&1 | tee ../../mout-VFS + cd samba-vscan-${vscan_ver} + autoreconf --force --install + CFLAGS="$CFLAGS -I../../../source/lib/replace -I../../../source/tdb/include -I../../../source/librpc" + export CFLAGS + ./configure --host=$HOST --target=$HOST --build=$HOST 2>&1 | \ + tee ../../../mout-configure-vscan + $MAKE 2>&1 | tee ../../../mout-vscan *** ./Install-OSR6.osr6 Thu Feb 21 10:07:47 2008 --- ./Install-OSR6 Thu Feb 21 10:07:47 2008 *************** *** 0 **** --- 1,186 ---- + #!/bin/sh + + RPMBUILDROOT=/u/tmp/samba + MAKE=/usr/gnu/bin/make + export MAKE RPMBUILDROOT RPMBUILDDIR + vscan_ver=0.3.6b + defaultdocdir=/usr/share/doc/packages + name=samba + datadir=/usr/share + includedir=/usr/include + localstatedir=/var + var=/var + lib=/usr/lib + libdir=/usr/lib + bindir=/usr/bin + sbindir=/usr/sbin + mandir=/usr/man + sysconfdir=/etc + DOCDIR=${defaultdocdir}/${name} + DOCBOOKDIR=${defaultdocdir}/${name}/docbook + SWATDIR=${datadir}/samba/swat + LOGDIR=${localstatedir}/log/samba + LIBDIR=${libdir}/samba + LOCKDIR=${localstatedir}/lib/samba + CONFIGDIR=${sysconfdir}/samba + INITDIR=${sysconfdir}/init.d + PIDDIR=${localstatedir}/run/samba + SPOOLDIR=${localstatedir}/spool/samba + VENDOR=SCO + + [ x"${RPMBUILDROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) + rm -rf ${RPMBUILDROOT} + + mkdir -p \ + ${RPMBUILDROOT}/${DOCDIR} \ + ${RPMBUILDROOT}/${DOCDIR}-vscan \ + ${RPMBUILDROOT}/${DOCBOOKDIR} \ + ${RPMBUILDROOT}/${sysconfdir}/openldap/schema \ + ${RPMBUILDROOT}/${CONFIGDIR} \ + ${RPMBUILDROOT}/${INITDIR} \ + ${RPMBUILDROOT}/${includedir} \ + ${RPMBUILDROOT}/${libdir}/python/lib-dynload \ + ${RPMBUILDROOT}/${LIBDIR}/config \ + ${RPMBUILDROOT}/${LIBDIR}/vfs \ + ${RPMBUILDROOT}/${LIBDIR}/pdb \ + ${RPMBUILDROOT}/${LIBDIR}/rpc \ + ${RPMBUILDROOT}/${LIBDIR}/auth \ + ${RPMBUILDROOT}/${LIBDIR}/charset \ + ${RPMBUILDROOT}/${LIBDIR}/idmap \ + ${RPMBUILDROOT}/${mandir}/man1 \ + ${RPMBUILDROOT}/${mandir}/man5 \ + ${RPMBUILDROOT}/${mandir}/man7 \ + ${RPMBUILDROOT}/${mandir}/man8 \ + ${RPMBUILDROOT}/${SWATDIR} \ + ${RPMBUILDROOT}/${bindir} \ + ${RPMBUILDROOT}/${sbindir} \ + ${RPMBUILDROOT}/${localstatedir}/adm \ + ${RPMBUILDROOT}/${LOCKDIR}/netlogon \ + ${RPMBUILDROOT}/${LOCKDIR}/drivers/W32X86 \ + ${RPMBUILDROOT}/${LOCKDIR}/drivers/WIN40 \ + ${RPMBUILDROOT}/${LOCKDIR}/drivers/W32ALPHA \ + ${RPMBUILDROOT}/${LOCKDIR}/drivers/W32MIPS \ + ${RPMBUILDROOT}/${LOCKDIR}/drivers/W32PPC \ + ${RPMBUILDROOT}/${LOCKDIR}/printing \ + ${RPMBUILDROOT}/${LOCKDIR}/profiles \ + ${RPMBUILDROOT}/${LOGDIR} \ + ${RPMBUILDROOT}/${PIDDIR} \ + ${RPMBUILDROOT}/${SPOOLDIR} \ + ${RPMBUILDROOT}/${libdir}/cups/backend/ \ + ${RPMBUILDROOT}/${var}/adm/fillup-templates \ + ${RPMBUILDROOT}/${var}/lock/subsys + ${MAKE} -C source/ DESTDIR=${RPMBUILDROOT} install \ + BINDIR=${bindir} \ + CONFIGFILE=${CONFIGDIR}/smb.conf \ + DRIVERFILE=${CONFIGDIR}/printers.def \ + LIBDIR=$libdir/samba \ + LMHOSTSFILE=${CONFIGDIR}/lmhosts \ + LOCKDIR=${LOCKDIR} \ + LOGFILEBASE=${LOGDIR} \ + MANDIR=${mandir} \ + SBINDIR=${sbindir} \ + SMB_PASSWD_FILE=${CONFIGDIR}/smbpasswd \ + SWATDIR=${SWATDIR} + ${MAKE} -C source/ DESTDIR=${RPMBUILDROOT} installmodules \ + LIBDIR=${libdir}/samba + # utility scripts + scripts="creategroup mksmbpasswd.sh" + mkdir -p examples/scripts + for i in $scripts; do + cp -p "source/script/${i}" examples/scripts + done + # configuration files + cd vendor-files + echo "# smb.conf is the main Samba configuration file. You find a full commented" >smb.conf + echo "# version at ${DOCDIR}/examples/smb.conf.${VENDOR}" >>config/smb.conf + echo "# Date: $( date -I)" >>config/smb.conf + grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf + cp -p config/smb.conf.vendor ../examples/smb.conf.${VENDOR} + for file in smb.conf lmhosts smbusers smbpasswd smbusers; do + cp -p "config/${file}" ${RPMBUILDROOT}/${CONFIGDIR}/ + done + # start scripts + startScripts="smb nmb winbind" + for script in ${startScripts}; do + cp -p "init/${script}" ${RPMBUILDROOT}/${INITDIR}/ + ln -sf "../../${INITDIR}/${script}" "${RPMBUILDROOT}/${sbindir}/rc${script}" + done + cp -p tools/nmbstatus ${RPMBUILDROOT}/${bindir}/ + pod2man tools/nmbstatus >${RPMBUILDROOT}/${mandir}/man1/nmbstatus.1 + # PDF generator + cp -p tools/smbprngenpdf ${RPMBUILDROOT}/${bindir}/ + cp -p config/dhcp.conf ${RPMBUILDROOT}/${var}/adm/fillup-templates/samba-client-dhcp.conf + cp -p config/sysconfig.dhcp-samba-client ${RPMBUILDROOT}/${var}/adm/fillup-templates/ + cp -p docu/README.vendor ${RPMBUILDROOT}/${DOCDIR}/README.${VENDOR} + sed -e "s/VENDOR/${VENDOR}/g" docu/htmldocs.html >../docs/htmldocs/index.html + cp -p docu/manpages.html ../docs/htmldocs + cp -p docu/welcome-en-no-samba-doc.html ${RPMBUILDROOT}/${SWATDIR}/help + # Update message handling + cd .. + # libnss_wins.so + install -m 0755 source/nsswitch/libnss_wins.so ${RPMBUILDROOT}/${lib}/libnss_wins.so.2 + # winbind stuff + install -m 0755 source/nsswitch/libnss_winbind.so ${RPMBUILDROOT}/${lib}/libnss_winbind.so.2 + # smbfilter + cp -p source/bin/smbfilter ${RPMBUILDROOT}/${bindir}/ + # editreg + #cp -p source/bin/editreg ${RPMBUILDROOT}/${bindir}/ + # smbget + cp -p source/bin/smbget ${RPMBUILDROOT}/${bindir}/ + # workaround for broken Makefile + rm "${RPMBUILDROOT}/${LIBDIR}/libsmbclient.so" + # install libsmbclient + install -m 0755 source/bin/libsmbclient.a ${RPMBUILDROOT}/${libdir} + install -m 0755 source/bin/libsmbclient.so ${RPMBUILDROOT}/${libdir}/libsmbclient.so.0 + ln -s ${libdir}/libsmbclient.so.0 ${RPMBUILDROOT}/${libdir}/libsmbclient.so + install -m 0644 source/include/libsmbclient.h ${RPMBUILDROOT}/${includedir} + # install nsswitch-headers (for squid, etc. #FIXME) + mkdir -p ${RPMBUILDROOT}/${includedir}/samba/nsswitch + for i in winbind_client.h winbind_nss.h winbind_nss_config.h winbind_nss_linux.h winbindd.h winbindd_nss.h winbindd_proto.h; do + cp -p "source/nsswitch/${i}" ${RPMBUILDROOT}/${includedir}/samba/nsswitch/ + done + # install smbtorture and other test-programs + install -m 0755 source/bin/debug2html ${RPMBUILDROOT}/${bindir}/ + install -m 0755 source/bin/log2pcap ${RPMBUILDROOT}/${bindir}/ + install -m 0755 source/bin/smbtorture ${RPMBUILDROOT}/${bindir}/ + install -m 0755 source/bin/talloctort ${RPMBUILDROOT}/${bindir}/ + install -m 0755 source/bin/msgtest ${RPMBUILDROOT}/${bindir}/ + install -m 0755 source/bin/masktest ${RPMBUILDROOT}/${bindir}/ + install -m 0755 source/bin/locktest* ${RPMBUILDROOT}/${bindir}/ + install -m 0755 source/bin/nsstest ${RPMBUILDROOT}/${bindir}/ + install -m 0755 source/bin/vfstest ${RPMBUILDROOT}/${bindir}/ + # install tdb tools + install -m 0755 source/bin/tdbdump ${RPMBUILDROOT}/${bindir}/ + #install -m 0755 source/tdb/tdbtest ${RPMBUILDROOT}/${bindir}/ + install -m 0755 source/bin/tdbtool ${RPMBUILDROOT}/${bindir}/ + install -m 0755 source/tdb/bin/tdbtorture ${RPMBUILDROOT}/${bindir}/ + # install VFS-modules + install -m 0755 examples/VFS/*.so ${RPMBUILDROOT}/${LIBDIR}/vfs/ + # install PDB-modules + #libtool --mode=install install -m 0755 examples/pdb/pdb_test.so ${RPMBUILDROOT}/${LIBDIR}/pdb/ + # install VSCAN-vfs-modules + ${MAKE} -C examples/VFS/samba-vscan-${vscan_ver} install DESTDIR="${RPMBUILDROOT}" + # cups SMB support + ln -sf ../../../bin/smbspool ${RPMBUILDROOT}/${libdir}/cups/backend/smb + # install smbwrapper + #install -m 0755 examples/libsmbclient/smbwrapper/smbwrapper.so \ + # ${RPMBUILDROOT}/${LIBDIR}/ + install -m 0755 examples/libsmbclient/smbwrapper/smbsh \ + ${RPMBUILDROOT}/${bindir}/ + #cp -p examples/libsmbclient/smbwrapper/README \ + # ${RPMBUILDROOT}/${DOCDIR}/README.smbwrapper + # this is empty + rm -rf docs/yodldocs + mv examples/VFS/samba-vscan-${vscan_ver} . + rm -rf docs/manpages + cp -pR docs/* ${RPMBUILDROOT}/${DOCDIR} + rm -rf "${RPMBUILDROOT}/${DOCBOOKDIR}" + cp -pR examples/ ${RPMBUILDROOT}/${DOCDIR} + # using-samba book is part of the samba-doc package + if [ -e ${RPMBUILDROOT}/${SWATDIR}/using_samba ]; then + rm -rf "${RPMBUILDROOT}/${SWATDIR}/using_samba" + ln -s "${DOCDIR}/htmldocs/using_samba" "${RPMBUILDROOT}/${SWATDIR}" + fi + # copy the schema + cp -p examples/LDAP/samba.schema ${RPMBUILDROOT}/${sysconfdir}/openldap/schema/samba3.schema + mv samba-vscan-${vscan_ver} examples/VFS/samba-vscan-${vscan_ver}