Index: uClinux-dist/user/samba/source/Makefile diff -c uClinux-dist/user/samba/source/Makefile:1.7 uClinux-dist/user/samba/source/Makefile:1.9 *** uClinux-dist/user/samba/source/Makefile:1.7 Mon Oct 8 15:18:12 2001 --- uClinux-dist/user/samba/source/Makefile Fri Nov 23 15:34:50 2001 *************** *** 80,86 **** #PROGS1 = bin/testparm bin/smbstatus # bin/smbclient bin/smbspool bin/testprns #PROGS2 = bin/rpcclient bin/smbpasswd bin/make_smbcodepage bin/make_unicodemap ! #MPROGS = PROGS = $(PROGS1) $(PROGS2) $(MPROGS) #bin/nmblookup bin/make_printerdef --- 80,86 ---- #PROGS1 = bin/testparm bin/smbstatus # bin/smbclient bin/smbspool bin/testprns #PROGS2 = bin/rpcclient bin/smbpasswd bin/make_smbcodepage bin/make_unicodemap ! MPROGS = bin/smbmount bin/smbmnt bin/smbumount PROGS = $(PROGS1) $(PROGS2) $(MPROGS) #bin/nmblookup bin/make_printerdef *************** *** 276,284 **** all : CHECK $(SPROGS) $(PROGS) romfs: ! $(ROMFSINST) bin/nmbd /bin/nmbd ! $(ROMFSINST) bin/smbd /bin/smbd ! $(ROMFSINST) /etc/default/smb.conf smbwrapper : CHECK bin/smbsh bin/smbwrapper.so --- 276,287 ---- all : CHECK $(SPROGS) $(PROGS) romfs: ! $(ROMFSINST) -e CONFIG_USER_SAMBA /etc/default/smb.conf ! $(ROMFSINST) -e CONFIG_USER_SAMBA_NMBD bin/nmbd /bin/nmbd ! $(ROMFSINST) -e CONFIG_USER_SAMBA_SMBD bin/smbd /bin/smbd ! $(ROMFSINST) -e CONFIG_USER_SAMBA_SMBMOUNT bin/smbmnt /bin/smbmnt ! $(ROMFSINST) -e CONFIG_USER_SAMBA_SMBMOUNT bin/smbmount /bin/smbmount ! $(ROMFSINST) -e CONFIG_USER_SAMBA_SMBUMOUNT bin/smbumount /bin/smbumount smbwrapper : CHECK bin/smbsh bin/smbwrapper.so Index: uClinux-dist/user/samba/source/client/smbmnt.c diff -c uClinux-dist/user/samba/source/client/smbmnt.c:1.1.1.1 uClinux-dist/user/samba/source/client/smbmnt.c:1.2 *** uClinux-dist/user/samba/source/client/smbmnt.c:1.1.1.1 Mon Dec 11 15:57:29 2000 --- uClinux-dist/user/samba/source/client/smbmnt.c Fri Nov 30 10:30:39 2001 *************** *** 16,21 **** --- 16,26 ---- #include #include + #ifdef EMBED + #undef NR_FILE + #endif + + #ifndef MS_MGC_VAL /* This may look strange but MS_MGC_VAL is what we are looking for and is what we need from under libc systems and is Index: uClinux-dist/user/samba/source/client/smbmount.c diff -c uClinux-dist/user/samba/source/client/smbmount.c:1.1.1.1 uClinux-dist/user/samba/source/client/smbmount.c:1.2 *** uClinux-dist/user/samba/source/client/smbmount.c:1.1.1.1 Mon Dec 11 15:57:29 2000 --- uClinux-dist/user/samba/source/client/smbmount.c Fri Nov 30 10:30:39 2001 *************** *** 65,70 **** --- 65,71 ---- exit(0); } + #ifndef EMBED static void daemonize(void) { int j, status; *************** *** 94,99 **** --- 95,101 ---- signal( SIGTERM, SIG_DFL ); chdir("/"); } + #endif static void close_our_files(int client_fd) { *************** *** 394,404 **** --- 396,409 ---- exit(1); } + #ifndef EMBED + /* Set up to return as a daemon child and wait in the parent until the child say it's ready... */ daemonize(); + #endif pstrcpy(svc2, service); string_replace(svc2, '\\','/'); *************** *** 437,443 **** args[i++] = xstrdup(tmp); } ! if (fork() == 0) { if (file_exist(BINDIR "/smbmnt", NULL)) { execv(BINDIR "/smbmnt", args); fprintf(stderr,"execv of %s failed. Error was %s.", BINDIR "/smbmnt", strerror(errno)); --- 442,448 ---- args[i++] = xstrdup(tmp); } ! if (vfork() == 0) { if (file_exist(BINDIR "/smbmnt", NULL)) { execv(BINDIR "/smbmnt", args); fprintf(stderr,"execv of %s failed. Error was %s.", BINDIR "/smbmnt", strerror(errno)); *************** *** 445,451 **** execvp("smbmnt", args); fprintf(stderr,"execvp of smbmnt failed. Error was %s.", strerror(errno) ); } ! exit(1); } if (waitpid(-1, &status, 0) == -1) { --- 450,456 ---- execvp("smbmnt", args); fprintf(stderr,"execvp of smbmnt failed. Error was %s.", strerror(errno) ); } ! _exit(1); } if (waitpid(-1, &status, 0) == -1) { Index: uClinux-dist/config/config.in diff -c uClinux-dist/config/config.in:1.61 uClinux-dist/config/config.in:1.62 *** uClinux-dist/config/config.in:1.61 Thu Nov 22 11:51:09 2001 --- uClinux-dist/config/config.in Fri Nov 23 15:05:06 2001 *************** *** 110,115 **** --- 110,117 ---- bool 'mount' CONFIG_USER_MOUNT_MOUNT bool 'umount' CONFIG_USER_MOUNT_UMOUNT bool 'fdisk' CONFIG_USER_FDISK_FDISK + + comment 'EXT2' bool 'e2fsck' CONFIG_USER_E2FSPROGS_E2FSCK_E2FSCK bool 'mke2fs' CONFIG_USER_E2FSPROGS_MISC_MKE2FS bool 'badblocks' CONFIG_USER_E2FSPROGS_MISC_BADBLOCKS *************** *** 119,133 **** bool 'fsck' CONFIG_USER_E2FSPROGS_MISC_FSCK bool 'lsattr' CONFIG_USER_E2FSPROGS_MISC_LSATTR bool 'mklost+found' CONFIG_USER_E2FSPROGS_MISC_MKLOST_FOUND bool 'reiserfsprogs' CONFIG_USER_REISERFSPROGS bool ' debugreiserfs' CONFIG_USER_REISERFSPROGS_DEBUGRESIERFS bool ' mkreiserfs' CONFIG_USER_REISERFSPROGS_MKREISERFS bool ' reiserfsck' CONFIG_USER_REISERFSPROGS_REISERFSCK bool ' resize_reiserfs' CONFIG_USER_REISERFSPROGS_RESIZE_REISERFS bool ' unpack' CONFIG_USER_REISERFSPROGS_UNPACK ! bool 'tune2fs' CONFIG_USER_E2FSPROGS_MISC_TUNE2FS ! bool 'uuidgen' CONFIG_USER_E2FSPROGS_MISC_UUIDGEN bool 'samba' CONFIG_USER_SAMBA bool 'smbmount' CONFIG_USER_SMBMOUNT_SMBMOUNT bool 'smbumount' CONFIG_USER_SMBMOUNT_SMBUMOUNT --- 121,145 ---- bool 'fsck' CONFIG_USER_E2FSPROGS_MISC_FSCK bool 'lsattr' CONFIG_USER_E2FSPROGS_MISC_LSATTR bool 'mklost+found' CONFIG_USER_E2FSPROGS_MISC_MKLOST_FOUND + bool 'tune2fs' CONFIG_USER_E2FSPROGS_MISC_TUNE2FS + bool 'uuidgen' CONFIG_USER_E2FSPROGS_MISC_UUIDGEN + + comment 'RESIERFS' bool 'reiserfsprogs' CONFIG_USER_REISERFSPROGS bool ' debugreiserfs' CONFIG_USER_REISERFSPROGS_DEBUGRESIERFS bool ' mkreiserfs' CONFIG_USER_REISERFSPROGS_MKREISERFS bool ' reiserfsck' CONFIG_USER_REISERFSPROGS_REISERFSCK bool ' resize_reiserfs' CONFIG_USER_REISERFSPROGS_RESIZE_REISERFS bool ' unpack' CONFIG_USER_REISERFSPROGS_UNPACK ! ! comment 'SAMBA' bool 'samba' CONFIG_USER_SAMBA + bool ' smbd' CONFIG_USER_SAMBA_SMBD + bool ' nmbd' CONFIG_USER_SAMBA_NMBD + bool ' smbmount' CONFIG_USER_SAMBA_SMBMOUNT + bool ' smbumount' CONFIG_USER_SAMBA_SMBUMOUNT + + comment 'SMBFS' bool 'smbmount' CONFIG_USER_SMBMOUNT_SMBMOUNT bool 'smbumount' CONFIG_USER_SMBMOUNT_SMBUMOUNT