OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   30-Jun-2004 22:54:27
  Branch: HEAD                             Handle: -NONE-

  Modified files:
    openpkg-src/samba       samba.spec smb.conf

  Log:
    work-off configuration once again (changes still not tested under
    run-time)

  Summary:
    Revision    Changes     Path
    1.67        +3  -1      openpkg-src/samba/samba.spec
    1.10        +28 -18     openpkg-src/samba/smb.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/samba/samba.spec
  ============================================================================
  $ cvs diff -u -r1.66 -r1.67 samba.spec
  --- openpkg-src/samba/samba.spec      30 Jun 2004 18:58:38 -0000      1.66
  +++ openpkg-src/samba/samba.spec      30 Jun 2004 20:54:26 -0000      1.67
  @@ -149,9 +149,11 @@
         %{l_make} %{l_mflags} installswat DESTDIR=$RPM_BUILD_ROOT
   %endif
       ) || exit $?
  -    l_hostname=`%{l_shtool} echo -e %h%d`
  +    l_hostname=`%{l_shtool} echo -e %h`
  +    l_domainname=`%{l_shtool} echo -e %d`
       %{l_shtool} install -c -m 644 %{l_value -s -a} \
           -e "s;@l_hostname@;$l_hostname;g" \
  +        -e "s;@l_domainname@;$l_domainname;g" \
           %{SOURCE smb.conf} \
           %{SOURCE smb.hosts} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/samba/
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/samba/smb.conf
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 smb.conf
  --- openpkg-src/samba/smb.conf        30 Jun 2004 18:58:38 -0000      1.9
  +++ openpkg-src/samba/smb.conf        30 Jun 2004 20:54:26 -0000      1.10
  @@ -5,10 +5,11 @@
   #   global parameters
   [global]
       workgroup            = WORKGROUP
  -    server string        = @l_hostname@ (Samba %v)
       netbios name         = @l_hostname@
  +    server string        = @l_hostname@@l_domainname@ (Samba %v)
       bind interfaces only = yes
       interfaces           = 127.0.0.1
  +    hosts allow          = 127.0.0.1/255.0.0.0 192.168.0.0/255.255.255.0 [EMAIL 
PROTECTED]@
       smb passwd file      = @l_prefix@/etc/samba/smb.passwd
       pid directory        = @l_prefix@/var/samba/run
       lock directory       = @l_prefix@/var/samba/run/locks
  @@ -18,7 +19,11 @@
       printing             = bsd
       printcap name        = /etc/printcap
       load printers        = yes
  +    invalid users        = root
  +    map to guest         = Bad User
       guest account        = nobody
  +    null passwords       = no
  +    passdb backend       = smbpasswd
       socket options       = TCP_NODELAY
       mangle case          = no
       case sensitive       = no
  @@ -27,15 +32,16 @@
       short preserve case  = yes
       dead time            = 0
       debug level          = 0
  -    wins support         = no
       getwd cache          = yes
  -    widelinks            = yes
  +    wide links           = yes
       log level            = 1
       os level             = 64
       preferred master     = no
       domain master        = no
       domain logons        = no
       local master         = yes
  +    time server          = yes
  +    wins support         = no
       logon path           = \\%N\profiles\%u
       logon drive          = U:
       logon home           = \\%N\%u
  @@ -45,45 +51,49 @@
   #   magic share for logons
   [netlogon]
       path                 = @l_prefix@/var/samba/netlogon
  -    writeable            = no
  -    create mask          = 0600
  -    directory mask       = 0700
  +    browseable           = no
  +    guest ok             = no
  +    read only            = yes
   
   #   magic share for profiles
   [profiles]
       path                 = @l_prefix@/var/samba/profiles
  -    writeable            = yes
  +    browseable           = no
  +    guest ok             = no
  +    read only            = no
   
   #   magic share for all user home directories
   [homes]
       comment              = Home Directories
       browseable           = yes
  +    guest ok             = no
       read only            = no
  -    create mask          = 0644
  +    create mask          = 0755
  +    force create mode    = 0600
       directory mask       = 0755
  +    force directory mode = 0700
       map archive          = no
   
   #   magic share for all printers
   [printers]
       comment              = System Printers
       path                 = @l_prefix@/var/samba/spool
  -    create mask          = 0700
  -    printable            = yes
       browseable           = yes
       guest ok             = yes
  -    public               = no
  -    writable             = no
  +    read only            = yes
  +    printable            = yes
  +    create mask          = 0700
   
   #   custom share, usable by all users
   [tmp]
       comment              = Public
       path                 = /tmp
       browseable           = yes
  -    public               = yes
  -    writeable            = yes
  -    force create mode    = 0775
  -    create mask          = 0775
  -    force group          = nobody
  +    guest ok             = yes
       read only            = no
  -    public               = yes
  +    force group          = nobody
  +    create mask          = 0755
  +    force create mode    = 0600
  +    directory mask       = 0755
  +    force directory mode = 0700
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to