mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
merge from 2.2 branch
This commit is contained in:
parent
425bb0f405
commit
692c23fe86
@ -36,6 +36,10 @@ close IGNORES;
|
|||||||
# get the names of all the binary files to be installed
|
# get the names of all the binary files to be installed
|
||||||
open(MAKEFILE,"$SRCDIR/source/Makefile") || die "Unable to open Makefile\n";
|
open(MAKEFILE,"$SRCDIR/source/Makefile") || die "Unable to open Makefile\n";
|
||||||
@makefile = <MAKEFILE>;
|
@makefile = <MAKEFILE>;
|
||||||
|
@winbind_progs = grep(/^WINBIND_PROGS /,@makefile);
|
||||||
|
@winbind_sprogs = grep(/^WINBIND_SPROGS /,@makefile);
|
||||||
|
@winbind_lprogs = grep(/^WINBIND_LPROGS /,@makefile);
|
||||||
|
@winbind_pam_progs = grep(/^WINBIND_PAM_PROGS /,@makefile);
|
||||||
@sprogs = grep(/^SPROGS /,@makefile);
|
@sprogs = grep(/^SPROGS /,@makefile);
|
||||||
@progs1 = grep(/^PROGS1 /,@makefile);
|
@progs1 = grep(/^PROGS1 /,@makefile);
|
||||||
@progs2 = grep(/^PROGS2 /,@makefile);
|
@progs2 = grep(/^PROGS2 /,@makefile);
|
||||||
@ -45,8 +49,25 @@ open(MAKEFILE,"$SRCDIR/source/Makefile") || die "Unable to open Makefile\n";
|
|||||||
@codepagelist = grep(/^CODEPAGELIST/,@makefile);
|
@codepagelist = grep(/^CODEPAGELIST/,@makefile);
|
||||||
close MAKEFILE;
|
close MAKEFILE;
|
||||||
|
|
||||||
|
if (@winbind_progs) {
|
||||||
|
@winbind_progs[0] =~ s/^.*\=//;
|
||||||
|
@winbind_progs = split(' ',@winbind_progs[0]);
|
||||||
|
}
|
||||||
|
if (@winbind_sprogs) {
|
||||||
|
@winbind_sprogs[0] =~ s/^.*\=//;
|
||||||
|
@winbind_sprogs = split(' ',@winbind_sprogs[0]);
|
||||||
|
}
|
||||||
|
if (@winbind_lprogs) {
|
||||||
|
@winbind_lprogs[0] =~ s/^.*\=//;
|
||||||
|
@winbind_lprogs = split(' ',@winbind_lprogs[0]);
|
||||||
|
}
|
||||||
|
if (@winbind_pam_progs) {
|
||||||
|
@winbind_pam_progs[0] =~ s/^.*\=//;
|
||||||
|
@winbind_pam_progs = split(' ',@winbind_pam_progs[0]);
|
||||||
|
}
|
||||||
if (@sprogs) {
|
if (@sprogs) {
|
||||||
@sprogs[0] =~ s/^.*\=//;
|
@sprogs[0] =~ s/^.*\=//;
|
||||||
|
@sprogs[0] =~ s/\$\(\S+\)\s//g;
|
||||||
@sprogs = split(' ',@sprogs[0]);
|
@sprogs = split(' ',@sprogs[0]);
|
||||||
}
|
}
|
||||||
if (@progs) {
|
if (@progs) {
|
||||||
@ -90,7 +111,8 @@ system("cp -f ../swat/README ../packaging/SGI/swat");
|
|||||||
chdir $curdir;
|
chdir $curdir;
|
||||||
|
|
||||||
# add my local files to the list of binaries to install
|
# add my local files to the list of binaries to install
|
||||||
@bins = sort byfilename (@sprogs,@progs,@progs1,@progs2,@mprogs,@scripts,("/findsmb","/sambalp","/smbprint"));
|
@bins = sort byfilename (@sprogs,@progs,@progs1,@progs2,@mprogs,@scripts,@winbind_progs,@winbind_sprogs,("/findsmb","/sambalp","/smbprint"));
|
||||||
|
@nsswitch = sort byfilename (@winbind_lprogs,@winbind_pam_progs);
|
||||||
|
|
||||||
# get a complete list of all files in the tree
|
# get a complete list of all files in the tree
|
||||||
chdir "$SRCDIR/";
|
chdir "$SRCDIR/";
|
||||||
@ -156,6 +178,15 @@ while(@bins) {
|
|||||||
elsif ($filename eq "smbprint") {
|
elsif ($filename eq "smbprint") {
|
||||||
print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/packaging/SGI/$filename $PKG.sw.base\n";
|
print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/packaging/SGI/$filename $PKG.sw.base\n";
|
||||||
}
|
}
|
||||||
|
elsif ($filename eq "smbd") {
|
||||||
|
print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base \n";
|
||||||
|
print IDB "f 0755 root sys usr/samba/bin/$filename.noquota $SRCPFX/source/$nextfile.noquota $PKG.sw.base \n";
|
||||||
|
print IDB "f 0755 root sys usr/samba/bin/$filename.profile $SRCPFX/source/$nextfile.profile $PKG.sw.base \n";
|
||||||
|
}
|
||||||
|
elsif ($filename eq "nmbd") {
|
||||||
|
print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base \n";
|
||||||
|
print IDB "f 0755 root sys usr/samba/bin/$filename.profile $SRCPFX/source/$nextfile.profile $PKG.sw.base \n";
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base \n";
|
print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base \n";
|
||||||
}
|
}
|
||||||
@ -185,6 +216,22 @@ while (@codepage) {
|
|||||||
}
|
}
|
||||||
print IDB "f 0644 root sys usr/samba/lib/smb.conf $SRCPFX/packaging/SGI/smb.conf $PKG.sw.base config(suggest)\n";
|
print IDB "f 0644 root sys usr/samba/lib/smb.conf $SRCPFX/packaging/SGI/smb.conf $PKG.sw.base config(suggest)\n";
|
||||||
|
|
||||||
|
if (@nsswitch) {
|
||||||
|
print IDB "d 0644 root sys usr/samba/nsswitch $SRCPFX/packaging/SGI $PKG.sw.base\n";
|
||||||
|
while(@nsswitch) {
|
||||||
|
$nextfile = shift @nsswitch;
|
||||||
|
($filename = $nextfile) =~ s/^.*\///;;
|
||||||
|
print IDB "f 0755 root sys usr/samba/nsswitch/$filename $SRCPFX/source/$nextfile $PKG.sw.base \n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
print IDB "d 0755 lp sys usr/samba/printer $SRCPFX/packaging/SGI $PKG.sw.base\n";
|
||||||
|
print IDB "d 0755 lp sys usr/samba/printer/W32X86 $SRCPFX/packaging/SGI $PKG.sw.base\n";
|
||||||
|
print IDB "d 0755 lp sys usr/samba/printer/WIN40 $SRCPFX/packaging/SGI $PKG.sw.base\n";
|
||||||
|
print IDB "d 0755 lp sys usr/samba/printer/W32MIPS $SRCPFX/packaging/SGI $PKG.sw.base\n";
|
||||||
|
print IDB "d 0755 lp sys usr/samba/printer/W32ALPHA $SRCPFX/packaging/SGI $PKG.sw.base\n";
|
||||||
|
print IDB "d 0755 lp sys usr/samba/printer/W32PPC $SRCPFX/packaging/SGI $PKG.sw.base\n";
|
||||||
|
|
||||||
print IDB "d 0644 root sys usr/samba/private $SRCPFX/packaging/SGI $PKG.sw.base\n";
|
print IDB "d 0644 root sys usr/samba/private $SRCPFX/packaging/SGI $PKG.sw.base\n";
|
||||||
print IDB "f 0600 root sys usr/samba/private/smbpasswd $SRCPFX/packaging/SGI/smbpasswd $PKG.sw.base config(suggest)\n";
|
print IDB "f 0600 root sys usr/samba/private/smbpasswd $SRCPFX/packaging/SGI/smbpasswd $PKG.sw.base config(suggest)\n";
|
||||||
|
|
||||||
@ -254,7 +301,7 @@ while (@catman) {
|
|||||||
}
|
}
|
||||||
print IDB "f 0664 root sys usr/share/catman/u_man/cat$dirnum/$file $SRCPFX/$nextfile $PKG.man.manpages\n";
|
print IDB "f 0664 root sys usr/share/catman/u_man/cat$dirnum/$file $SRCPFX/$nextfile $PKG.man.manpages\n";
|
||||||
}
|
}
|
||||||
print IDB "d 01777 nobody nobody var/spool/samba $SRCPFX/packaging/SGI $PKG.sw.base\n";
|
print IDB "d 01777 lp sys var/spool/samba $SRCPFX/packaging/SGI $PKG.sw.base\n";
|
||||||
|
|
||||||
close IDB;
|
close IDB;
|
||||||
print "\n\n$PKG.idb file has been created\n";
|
print "\n\n$PKG.idb file has been created\n";
|
||||||
|
@ -58,12 +58,11 @@
|
|||||||
; Set a max size for log files in Kb
|
; Set a max size for log files in Kb
|
||||||
max log size = 50
|
max log size = 50
|
||||||
|
|
||||||
; You will need a world readable lock directory and "share modes=yes"
|
; You will need a world readable lock directory
|
||||||
; if you want to support the file sharing modes for multiple users
|
; if you want to support the file sharing modes for multiple users
|
||||||
; of the same files
|
; of the same files
|
||||||
locking = yes
|
locking = yes
|
||||||
lock directory = /usr/samba/var/locks
|
lock directory = /usr/samba/var/locks
|
||||||
share modes = yes
|
|
||||||
|
|
||||||
security = user
|
security = user
|
||||||
|
|
||||||
@ -91,21 +90,23 @@
|
|||||||
; Uncomment the following if you wish to sync unix and smbpasswd
|
; Uncomment the following if you wish to sync unix and smbpasswd
|
||||||
; unix password sync = yes
|
; unix password sync = yes
|
||||||
|
|
||||||
|
; Printer admin account to allow uploading printer drivers
|
||||||
|
printer admin = lp
|
||||||
|
|
||||||
[homes]
|
[homes]
|
||||||
comment = Home Directories
|
comment = Home Directories
|
||||||
browseable = no
|
browseable = no
|
||||||
writeable = yes
|
writeable = yes
|
||||||
|
|
||||||
; Use the new NT style printer download setup.
|
; Share for printer drivers for automatic driver download
|
||||||
; See the file PRINTER_DRIVER2.txt in the docs directory for info.
|
|
||||||
;
|
;
|
||||||
;[print$]
|
[print$]
|
||||||
; comment = printer driver directory
|
comment = printer driver directory
|
||||||
; path = /usr/samba/printer
|
path = /usr/samba/printer
|
||||||
; guest ok = yes
|
guest ok = yes
|
||||||
; browseable = yes
|
browseable = yes
|
||||||
; read only = yes
|
read only = yes
|
||||||
; write list = ntadmin
|
write list = lp
|
||||||
|
|
||||||
[printers]
|
[printers]
|
||||||
comment = All Printers
|
comment = All Printers
|
||||||
@ -115,19 +116,6 @@
|
|||||||
guest ok = yes
|
guest ok = yes
|
||||||
writeable = no
|
writeable = no
|
||||||
create mask = 0700
|
create mask = 0700
|
||||||
;
|
|
||||||
; this specifies the location of the share containing the printer driver
|
|
||||||
; files - see the printer$ section above
|
|
||||||
;
|
|
||||||
; printer driver location = \\%L\printer$
|
|
||||||
;
|
|
||||||
; the following line will make all printers default to the QMS-PS 810 Turbo
|
|
||||||
; driver - which works quite well for Impressario. If you need a diferent
|
|
||||||
; driver for a specific printer, create a section for that printer and
|
|
||||||
; specify the correct printer driver.
|
|
||||||
;
|
|
||||||
; printer driver = QMS-PS 810 Turbo
|
|
||||||
|
|
||||||
|
|
||||||
[tmp]
|
[tmp]
|
||||||
comment = Temporary file space
|
comment = Temporary file space
|
||||||
|
Loading…
Reference in New Issue
Block a user