From 37f93590d8779e96ddfce9aaa272b1f6aef1d4d0 Mon Sep 17 00:00:00 2001 From: Alan Mizrahi Date: Tue, 27 Jan 2015 20:36:26 +0900 Subject: [notify] samba: port refactoring The previously bundled libraries are now individual ports, therefore manual action is needed to upgrade. IE: pkgrm samba; prt-get depinst samba /etc/rc.d/samba will now start all samba daemons: smbd, nmbd and winbindd, previously it didn't start winbindd. In most cases not all of them are needed, so now there are also individual scripts to suit all needs. --- samba/.footprint | 248 ++-------------------------------- samba/.md5sum | 6 +- samba/Pkgfile | 75 +++++----- samba/nmbd.rc | 79 +++++++++++ samba/samba-install_yapp_driver.patch | 14 -- samba/samba.rc | 28 ++++ samba/smbd.rc | 79 +++++++++++ samba/winbindd.rc | 79 +++++++++++ 8 files changed, 320 insertions(+), 288 deletions(-) create mode 100755 samba/nmbd.rc delete mode 100644 samba/samba-install_yapp_driver.patch create mode 100755 samba/samba.rc create mode 100755 samba/smbd.rc create mode 100755 samba/winbindd.rc (limited to 'samba') diff --git a/samba/.footprint b/samba/.footprint index 106e0615c..e4f2d2552 100644 --- a/samba/.footprint +++ b/samba/.footprint @@ -1,6 +1,9 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/rc.d/ +-rwxr-xr-x root/root etc/rc.d/nmbd -rwxr-xr-x root/root etc/rc.d/samba +-rwxr-xr-x root/root etc/rc.d/smbd +-rwxr-xr-x root/root etc/rc.d/winbindd drwxr-xr-x root/root etc/samba/ drwxr-xr-x root/root etc/samba/private/ -rw------- root/root etc/samba/smb.conf.default @@ -10,22 +13,12 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/dbwrap_tool -rwxr-xr-x root/root usr/bin/eventlogadm -rwxr-xr-x root/root usr/bin/gentest --rwxr-xr-x root/root usr/bin/ldbadd --rwxr-xr-x root/root usr/bin/ldbdel --rwxr-xr-x root/root usr/bin/ldbedit --rwxr-xr-x root/root usr/bin/ldbmodify --rwxr-xr-x root/root usr/bin/ldbrename --rwxr-xr-x root/root usr/bin/ldbsearch -rwxr-xr-x root/root usr/bin/locktest -rwxr-xr-x root/root usr/bin/masktest -rwxr-xr-x root/root usr/bin/ndrdump -rwxr-xr-x root/root usr/bin/net -rwxr-xr-x root/root usr/bin/nmblookup -rwxr-xr-x root/root usr/bin/nmblookup4 --rwxr-xr-x root/root usr/bin/ntdbbackup --rwxr-xr-x root/root usr/bin/ntdbdump --rwxr-xr-x root/root usr/bin/ntdbrestore --rwxr-xr-x root/root usr/bin/ntdbtool -rwxr-xr-x root/root usr/bin/ntlm_auth -rwxr-xr-x root/root usr/bin/oLschema2ldif -rwxr-xr-x root/root usr/bin/pdbedit @@ -37,7 +30,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/regtree -rwxr-xr-x root/root usr/bin/rpcclient -rwxr-xr-x root/root usr/bin/samba-regedit --rwxr-xr-x root/root usr/bin/samba-tool -rwxr-xr-x root/root usr/bin/sharesec -rwxr-xr-x root/root usr/bin/smbcacls -rwxr-xr-x root/root usr/bin/smbclient @@ -64,7 +56,6 @@ drwxr-xr-x root/root usr/include/samba-4.0/core/ -rw-r--r-- root/root usr/include/samba-4.0/core/werror.h -rw-r--r-- root/root usr/include/samba-4.0/credentials.h -rw-r--r-- root/root usr/include/samba-4.0/dcerpc.h --rw-r--r-- root/root usr/include/samba-4.0/dcerpc_server.h -rw-r--r-- root/root usr/include/samba-4.0/dlinklist.h -rw-r--r-- root/root usr/include/samba-4.0/domain_credentials.h drwxr-xr-x root/root usr/include/samba-4.0/gen_ndr/ @@ -138,6 +129,7 @@ drwxr-xr-x root/root usr/include/samba-4.0/samba/ -rw-r--r-- root/root usr/include/samba-4.0/smb_common.h -rw-r--r-- root/root usr/include/samba-4.0/smb_composite.h -rw-r--r-- root/root usr/include/samba-4.0/smb_constants.h +-rw-r--r-- root/root usr/include/samba-4.0/smb_ldap.h -rw-r--r-- root/root usr/include/samba-4.0/smb_raw.h -rw-r--r-- root/root usr/include/samba-4.0/smb_raw_interfaces.h -rw-r--r-- root/root usr/include/samba-4.0/smb_raw_signing.h @@ -149,6 +141,7 @@ drwxr-xr-x root/root usr/include/samba-4.0/samba/ -rw-r--r-- root/root usr/include/samba-4.0/smb_unix_ext.h -rw-r--r-- root/root usr/include/samba-4.0/smb_util.h -rw-r--r-- root/root usr/include/samba-4.0/smbconf.h +-rw-r--r-- root/root usr/include/samba-4.0/smbldap.h -rw-r--r-- root/root usr/include/samba-4.0/tdr.h -rw-r--r-- root/root usr/include/samba-4.0/torture.h -rw-r--r-- root/root usr/include/samba-4.0/tsocket.h @@ -179,9 +172,6 @@ lrwxrwxrwx root/root usr/lib/libdcerpc-binding.so.0 -> libdcerpc-binding.so.0.0. lrwxrwxrwx root/root usr/lib/libdcerpc-samr.so -> libdcerpc-samr.so.0.0.1 lrwxrwxrwx root/root usr/lib/libdcerpc-samr.so.0 -> libdcerpc-samr.so.0.0.1 -rwxr-xr-x root/root usr/lib/libdcerpc-samr.so.0.0.1 -lrwxrwxrwx root/root usr/lib/libdcerpc-server.so -> libdcerpc-server.so.0.0.1 -lrwxrwxrwx root/root usr/lib/libdcerpc-server.so.0 -> libdcerpc-server.so.0.0.1 --rwxr-xr-x root/root usr/lib/libdcerpc-server.so.0.0.1 lrwxrwxrwx root/root usr/lib/libdcerpc.so -> libdcerpc.so.0.0.1 lrwxrwxrwx root/root usr/lib/libdcerpc.so.0 -> libdcerpc.so.0.0.1 -rwxr-xr-x root/root usr/lib/libdcerpc.so.0.0.1 @@ -234,6 +224,8 @@ lrwxrwxrwx root/root usr/lib/libsmbclient.so.0 -> libsmbclient.so.0.2.1 -rwxr-xr-x root/root usr/lib/libsmbclient.so.0.2.1 lrwxrwxrwx root/root usr/lib/libsmbconf.so -> libsmbconf.so.0 -rwxr-xr-x root/root usr/lib/libsmbconf.so.0 +lrwxrwxrwx root/root usr/lib/libsmbldap.so -> libsmbldap.so.0 +-rwxr-xr-x root/root usr/lib/libsmbldap.so.0 lrwxrwxrwx root/root usr/lib/libsmbsharemodes.so -> libsmbsharemodes.so.0 -rwxr-xr-x root/root usr/lib/libsmbsharemodes.so.0 lrwxrwxrwx root/root usr/lib/libtevent-util.so -> libtevent-util.so.0.0.1 @@ -245,7 +237,6 @@ lrwxrwxrwx root/root usr/lib/libtorture.so.0 -> libtorture.so.0.0.1 lrwxrwxrwx root/root usr/lib/libwbclient.so -> libwbclient.so.0.11 lrwxrwxrwx root/root usr/lib/libwbclient.so.0 -> libwbclient.so.0.11 -rwxr-xr-x root/root usr/lib/libwbclient.so.0.11 --rwxr-xr-x root/root usr/lib/mit_samba.so drwxr-xr-x root/root usr/lib/perl5/ drwxr-xr-x root/root usr/lib/perl5/site_perl/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/ @@ -281,13 +272,10 @@ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/Parse/Pidl/Samba4/NDR/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/Parse/Pidl/Wireshark/ -rw-r--r-- root/root usr/lib/perl5/site_perl/5.18/Parse/Pidl/Wireshark/Conformance.pm -rw-r--r-- root/root usr/lib/perl5/site_perl/5.18/Parse/Pidl/Wireshark/NDR.pm -drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/Parse/Yapp/ --rw-r--r-- root/root usr/lib/perl5/site_perl/5.18/Parse/Yapp/Driver.pm drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/dcerpc.pc -rw-r--r-- root/root usr/lib/pkgconfig/dcerpc_atsvc.pc -rw-r--r-- root/root usr/lib/pkgconfig/dcerpc_samr.pc --rw-r--r-- root/root usr/lib/pkgconfig/dcerpc_server.pc -rw-r--r-- root/root usr/lib/pkgconfig/gensec.pc -rw-r--r-- root/root usr/lib/pkgconfig/ndr.pc -rw-r--r-- root/root usr/lib/pkgconfig/ndr_krb5pac.pc @@ -307,9 +295,6 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/wbclient.pc drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ --rwxr-xr-x root/root usr/lib/python2.7/site-packages/_tevent.so --rwxr-xr-x root/root usr/lib/python2.7/site-packages/ldb.so --rwxr-xr-x root/root usr/lib/python2.7/site-packages/ntdb.so drwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/__init__.py -rwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/_glue.so @@ -352,7 +337,6 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/dcerpc/ -rwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/dcerpc/winreg.so -rwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/dcerpc/wkssvc.so -rwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/dcerpc/xattr.so --rwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/dckeytab.so -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/descriptor.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/drs_utils.py -rwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/dsdb.so @@ -566,7 +550,6 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/netcmd/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/ntacls.py -rwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/param.so -rwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/policy.so --rwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/posix_eadb.so drwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/provision/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/provision/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/provision/backend.py @@ -648,80 +631,23 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/tests/samba_tool/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/web_server/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/web_server/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/xattr.py --rwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/xattr_native.so --rwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/xattr_tdb.so --rw-r--r-- root/root usr/lib/python2.7/site-packages/tevent.py drwxr-xr-x root/root usr/lib/samba/ drwxr-xr-x root/root usr/lib/samba/auth/ -rwxr-xr-x root/root usr/lib/samba/auth/script.so -drwxr-xr-x root/root usr/lib/samba/bind9/ --rwxr-xr-x root/root usr/lib/samba/bind9/dlz_bind9.so --rwxr-xr-x root/root usr/lib/samba/bind9/dlz_bind9_10.so --rwxr-xr-x root/root usr/lib/samba/bind9/dlz_bind9_9.so -drwxr-xr-x root/root usr/lib/samba/gensec/ --rwxr-xr-x root/root usr/lib/samba/gensec/krb5.so drwxr-xr-x root/root usr/lib/samba/idmap/ -rwxr-xr-x root/root usr/lib/samba/idmap/autorid.so -rwxr-xr-x root/root usr/lib/samba/idmap/hash.so +-rwxr-xr-x root/root usr/lib/samba/idmap/rfc2307.so -rwxr-xr-x root/root usr/lib/samba/idmap/rid.so -rwxr-xr-x root/root usr/lib/samba/idmap/tdb2.so drwxr-xr-x root/root usr/lib/samba/ldb/ --rwxr-xr-x root/root usr/lib/samba/ldb/acl.so --rwxr-xr-x root/root usr/lib/samba/ldb/aclread.so --rwxr-xr-x root/root usr/lib/samba/ldb/anr.so --rwxr-xr-x root/root usr/lib/samba/ldb/asq.so --rwxr-xr-x root/root usr/lib/samba/ldb/descriptor.so --rwxr-xr-x root/root usr/lib/samba/ldb/dirsync.so --rwxr-xr-x root/root usr/lib/samba/ldb/extended_dn_in.so --rwxr-xr-x root/root usr/lib/samba/ldb/extended_dn_out.so --rwxr-xr-x root/root usr/lib/samba/ldb/extended_dn_store.so -rwxr-xr-x root/root usr/lib/samba/ldb/ildap.so --rwxr-xr-x root/root usr/lib/samba/ldb/instancetype.so --rwxr-xr-x root/root usr/lib/samba/ldb/lazy_commit.so -rwxr-xr-x root/root usr/lib/samba/ldb/ldbsamba_extensions.so --rwxr-xr-x root/root usr/lib/samba/ldb/linked_attributes.so --rwxr-xr-x root/root usr/lib/samba/ldb/local_password.so --rwxr-xr-x root/root usr/lib/samba/ldb/new_partition.so --rwxr-xr-x root/root usr/lib/samba/ldb/objectclass.so --rwxr-xr-x root/root usr/lib/samba/ldb/objectclass_attrs.so --rwxr-xr-x root/root usr/lib/samba/ldb/objectguid.so --rwxr-xr-x root/root usr/lib/samba/ldb/operational.so --rwxr-xr-x root/root usr/lib/samba/ldb/paged_results.so --rwxr-xr-x root/root usr/lib/samba/ldb/paged_searches.so --rwxr-xr-x root/root usr/lib/samba/ldb/partition.so --rwxr-xr-x root/root usr/lib/samba/ldb/password_hash.so --rwxr-xr-x root/root usr/lib/samba/ldb/ranged_results.so --rwxr-xr-x root/root usr/lib/samba/ldb/rdn_name.so --rwxr-xr-x root/root usr/lib/samba/ldb/repl_meta_data.so --rwxr-xr-x root/root usr/lib/samba/ldb/resolve_oids.so --rwxr-xr-x root/root usr/lib/samba/ldb/rootdse.so --rwxr-xr-x root/root usr/lib/samba/ldb/samba3sam.so --rwxr-xr-x root/root usr/lib/samba/ldb/samba3sid.so --rwxr-xr-x root/root usr/lib/samba/ldb/samba_dsdb.so --rwxr-xr-x root/root usr/lib/samba/ldb/samba_secrets.so --rwxr-xr-x root/root usr/lib/samba/ldb/samldb.so --rwxr-xr-x root/root usr/lib/samba/ldb/sample.so --rwxr-xr-x root/root usr/lib/samba/ldb/schema_data.so --rwxr-xr-x root/root usr/lib/samba/ldb/schema_load.so --rwxr-xr-x root/root usr/lib/samba/ldb/secrets_tdb_sync.so --rwxr-xr-x root/root usr/lib/samba/ldb/server_sort.so --rwxr-xr-x root/root usr/lib/samba/ldb/show_deleted.so --rwxr-xr-x root/root usr/lib/samba/ldb/simple_dn.so --rwxr-xr-x root/root usr/lib/samba/ldb/simple_ldap_map.so --rwxr-xr-x root/root usr/lib/samba/ldb/skel.so --rwxr-xr-x root/root usr/lib/samba/ldb/subtree_delete.so --rwxr-xr-x root/root usr/lib/samba/ldb/subtree_rename.so --rwxr-xr-x root/root usr/lib/samba/ldb/tdb.so --rwxr-xr-x root/root usr/lib/samba/ldb/update_keytab.so --rwxr-xr-x root/root usr/lib/samba/ldb/wins_ldb.so -rwxr-xr-x root/root usr/lib/samba/libCHARSET3.so --rwxr-xr-x root/root usr/lib/samba/libHDB_SAMBA4.so -rwxr-xr-x root/root usr/lib/samba/libLIBWBCLIENT_OLD.so -rwxr-xr-x root/root usr/lib/samba/libMESSAGING.so -rwxr-xr-x root/root usr/lib/samba/libaddns.so -rwxr-xr-x root/root usr/lib/samba/libads.so -lrwxrwxrwx root/root usr/lib/samba/libasn1-samba4.so.8 -> libasn1-samba4.so.8.0.0 --rwxr-xr-x root/root usr/lib/samba/libasn1-samba4.so.8.0.0 -rwxr-xr-x root/root usr/lib/samba/libasn1util.so -rwxr-xr-x root/root usr/lib/samba/libauth.so -rwxr-xr-x root/root usr/lib/samba/libauth4.so @@ -738,12 +664,10 @@ lrwxrwxrwx root/root usr/lib/samba/libasn1-samba4.so.8 -> libasn1-samba4.so.8.0. -rwxr-xr-x root/root usr/lib/samba/libcliauth.so -rwxr-xr-x root/root usr/lib/samba/libcluster.so -rwxr-xr-x root/root usr/lib/samba/libcmdline-credentials.so --rwxr-xr-x root/root usr/lib/samba/libdb-glue.so -rwxr-xr-x root/root usr/lib/samba/libdbwrap.so -rwxr-xr-x root/root usr/lib/samba/libdcerpc-samba.so -rwxr-xr-x root/root usr/lib/samba/libdcerpc-samba4.so -rwxr-xr-x root/root usr/lib/samba/libdfs_server_ad.so --rwxr-xr-x root/root usr/lib/samba/libdlz_bind9_for_torture.so -rwxr-xr-x root/root usr/lib/samba/libdnsserver_common.so -rwxr-xr-x root/root usr/lib/samba/libdsdb-module.so -rwxr-xr-x root/root usr/lib/samba/liberrors.so @@ -751,29 +675,9 @@ lrwxrwxrwx root/root usr/lib/samba/libasn1-samba4.so.8 -> libasn1-samba4.so.8.0. -rwxr-xr-x root/root usr/lib/samba/libflag_mapping.so -rwxr-xr-x root/root usr/lib/samba/libgpo.so -rwxr-xr-x root/root usr/lib/samba/libgse.so -lrwxrwxrwx root/root usr/lib/samba/libgssapi-samba4.so.2 -> libgssapi-samba4.so.2.0.0 --rwxr-xr-x root/root usr/lib/samba/libgssapi-samba4.so.2.0.0 -lrwxrwxrwx root/root usr/lib/samba/libhcrypto-samba4.so.5 -> libhcrypto-samba4.so.5.0.1 --rwxr-xr-x root/root usr/lib/samba/libhcrypto-samba4.so.5.0.1 -lrwxrwxrwx root/root usr/lib/samba/libhdb-samba4.so.11 -> libhdb-samba4.so.11.0.2 --rwxr-xr-x root/root usr/lib/samba/libhdb-samba4.so.11.0.2 -lrwxrwxrwx root/root usr/lib/samba/libheimbase-samba4.so.1 -> libheimbase-samba4.so.1.0.0 --rwxr-xr-x root/root usr/lib/samba/libheimbase-samba4.so.1.0.0 -lrwxrwxrwx root/root usr/lib/samba/libheimntlm-samba4.so.1 -> libheimntlm-samba4.so.1.0.1 --rwxr-xr-x root/root usr/lib/samba/libheimntlm-samba4.so.1.0.1 -lrwxrwxrwx root/root usr/lib/samba/libhx509-samba4.so.5 -> libhx509-samba4.so.5.0.0 --rwxr-xr-x root/root usr/lib/samba/libhx509-samba4.so.5.0.0 -rwxr-xr-x root/root usr/lib/samba/libidmap.so --rwxr-xr-x root/root usr/lib/samba/libiniparser.so -rwxr-xr-x root/root usr/lib/samba/libinterfaces.so -lrwxrwxrwx root/root usr/lib/samba/libkdc-samba4.so.2 -> libkdc-samba4.so.2.0.0 --rwxr-xr-x root/root usr/lib/samba/libkdc-samba4.so.2.0.0 -lrwxrwxrwx root/root usr/lib/samba/libkrb5-samba4.so.26 -> libkrb5-samba4.so.26.0.0 --rwxr-xr-x root/root usr/lib/samba/libkrb5-samba4.so.26.0.0 -rwxr-xr-x root/root usr/lib/samba/libkrb5samba.so --rwxr-xr-x root/root usr/lib/samba/libldb-cmdline.so -lrwxrwxrwx root/root usr/lib/samba/libldb.so.1 -> libldb.so.1.1.17 --rwxr-xr-x root/root usr/lib/samba/libldb.so.1.1.17 -rwxr-xr-x root/root usr/lib/samba/libldbsamba.so -rwxr-xr-x root/root usr/lib/samba/liblibcli_lsa3.so -rwxr-xr-x root/root usr/lib/samba/liblibcli_netlogon3.so @@ -786,19 +690,9 @@ lrwxrwxrwx root/root usr/lib/samba/libldb.so.1 -> libldb.so.1.1.17 -rwxr-xr-x root/root usr/lib/samba/libnon_posix_acls.so -rwxr-xr-x root/root usr/lib/samba/libnpa_tstream.so -rwxr-xr-x root/root usr/lib/samba/libnss_info.so -lrwxrwxrwx root/root usr/lib/samba/libntdb.so.0 -> libntdb.so.0.9 --rwxr-xr-x root/root usr/lib/samba/libntdb.so.0.9 --rwxr-xr-x root/root usr/lib/samba/libntvfs.so --rwxr-xr-x root/root usr/lib/samba/libpac.so -rwxr-xr-x root/root usr/lib/samba/libpopt_samba3.so --rwxr-xr-x root/root usr/lib/samba/libposix_eadb.so -rwxr-xr-x root/root usr/lib/samba/libprinting_migrate.so --rwxr-xr-x root/root usr/lib/samba/libprocess_model.so -lrwxrwxrwx root/root usr/lib/samba/libpyldb-util.so.1 -> libpyldb-util.so.1.1.17 --rwxr-xr-x root/root usr/lib/samba/libpyldb-util.so.1.1.17 -rwxr-xr-x root/root usr/lib/samba/libreplace.so -lrwxrwxrwx root/root usr/lib/samba/libroken-samba4.so.19 -> libroken-samba4.so.19.0.1 --rwxr-xr-x root/root usr/lib/samba/libroken-samba4.so.19.0.1 -rwxr-xr-x root/root usr/lib/samba/libsamba-modules.so -rwxr-xr-x root/root usr/lib/samba/libsamba-net.so -rwxr-xr-x root/root usr/lib/samba/libsamba-security.so @@ -808,19 +702,16 @@ lrwxrwxrwx root/root usr/lib/samba/libroken-samba4.so.19 -> libroken-samba4.so.1 -rwxr-xr-x root/root usr/lib/samba/libsamdb-common.so -rwxr-xr-x root/root usr/lib/samba/libsecrets3.so -rwxr-xr-x root/root usr/lib/samba/libserver-role.so --rwxr-xr-x root/root usr/lib/samba/libservice.so -rwxr-xr-x root/root usr/lib/samba/libshares.so -rwxr-xr-x root/root usr/lib/samba/libsmb_transport.so -rwxr-xr-x root/root usr/lib/samba/libsmbd_base.so -rwxr-xr-x root/root usr/lib/samba/libsmbd_conn.so -rwxr-xr-x root/root usr/lib/samba/libsmbd_shim.so +-rwxr-xr-x root/root usr/lib/samba/libsmbldaphelper.so -rwxr-xr-x root/root usr/lib/samba/libsmbpasswdparser.so -rwxr-xr-x root/root usr/lib/samba/libsmbregistry.so --rwxr-xr-x root/root usr/lib/samba/libsubunit.so -rwxr-xr-x root/root usr/lib/samba/libtdb-wrap.so -rwxr-xr-x root/root usr/lib/samba/libtdb_compat.so -lrwxrwxrwx root/root usr/lib/samba/libtevent.so.0 -> libtevent.so.0.9.18 --rwxr-xr-x root/root usr/lib/samba/libtevent.so.0.9.18 -rwxr-xr-x root/root usr/lib/samba/libtrusts_util.so -rwxr-xr-x root/root usr/lib/samba/libutil_cmdline.so -rwxr-xr-x root/root usr/lib/samba/libutil_ntdb.so @@ -828,31 +719,9 @@ lrwxrwxrwx root/root usr/lib/samba/libtevent.so.0 -> libtevent.so.0.9.18 -rwxr-xr-x root/root usr/lib/samba/libutil_setid.so -rwxr-xr-x root/root usr/lib/samba/libutil_tdb.so -rwxr-xr-x root/root usr/lib/samba/libwinbind-client.so -lrwxrwxrwx root/root usr/lib/samba/libwind-samba4.so.0 -> libwind-samba4.so.0.0.0 --rwxr-xr-x root/root usr/lib/samba/libwind-samba4.so.0.0.0 -rwxr-xr-x root/root usr/lib/samba/libxattr_tdb.so drwxr-xr-x root/root usr/lib/samba/nss_info/ -rwxr-xr-x root/root usr/lib/samba/nss_info/hash.so -drwxr-xr-x root/root usr/lib/samba/process_model/ --rwxr-xr-x root/root usr/lib/samba/process_model/onefork.so --rwxr-xr-x root/root usr/lib/samba/process_model/prefork.so --rwxr-xr-x root/root usr/lib/samba/process_model/standard.so -drwxr-xr-x root/root usr/lib/samba/service/ --rwxr-xr-x root/root usr/lib/samba/service/cldap.so --rwxr-xr-x root/root usr/lib/samba/service/dcerpc.so --rwxr-xr-x root/root usr/lib/samba/service/dns.so --rwxr-xr-x root/root usr/lib/samba/service/dns_update.so --rwxr-xr-x root/root usr/lib/samba/service/drepl.so --rwxr-xr-x root/root usr/lib/samba/service/kcc.so --rwxr-xr-x root/root usr/lib/samba/service/kdc.so --rwxr-xr-x root/root usr/lib/samba/service/ldap.so --rwxr-xr-x root/root usr/lib/samba/service/nbtd.so --rwxr-xr-x root/root usr/lib/samba/service/ntp_signd.so --rwxr-xr-x root/root usr/lib/samba/service/s3fs.so --rwxr-xr-x root/root usr/lib/samba/service/smb.so --rwxr-xr-x root/root usr/lib/samba/service/web.so --rwxr-xr-x root/root usr/lib/samba/service/winbind.so --rwxr-xr-x root/root usr/lib/samba/service/wrepl.so drwxr-xr-x root/root usr/lib/samba/vfs/ -rwxr-xr-x root/root usr/lib/samba/vfs/acl_tdb.so -rwxr-xr-x root/root usr/lib/samba/vfs/acl_xattr.so @@ -876,7 +745,6 @@ drwxr-xr-x root/root usr/lib/samba/vfs/ -rwxr-xr-x root/root usr/lib/samba/vfs/linux_xfs_sgid.so -rwxr-xr-x root/root usr/lib/samba/vfs/media_harmony.so -rwxr-xr-x root/root usr/lib/samba/vfs/netatalk.so --rwxr-xr-x root/root usr/lib/samba/vfs/posix_eadb.so -rwxr-xr-x root/root usr/lib/samba/vfs/preopen.so -rwxr-xr-x root/root usr/lib/samba/vfs/readahead.so -rwxr-xr-x root/root usr/lib/samba/vfs/readonly.so @@ -993,11 +861,6 @@ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/winbindd.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/nmbd --rwxr-xr-x root/root usr/sbin/samba --rwxr-xr-x root/root usr/sbin/samba_dnsupdate --rwxr-xr-x root/root usr/sbin/samba_kcc --rwxr-xr-x root/root usr/sbin/samba_spnupdate --rwxr-xr-x root/root usr/sbin/samba_upgradedns -rwxr-xr-x root/root usr/sbin/smbd -rwxr-xr-x root/root usr/sbin/winbindd drwxr-xr-x root/root usr/share/ @@ -1006,99 +869,6 @@ drwxr-xr-x root/root usr/share/samba/codepages/ -rw-r--r-- root/root usr/share/samba/codepages/lowcase.dat -rw-r--r-- root/root usr/share/samba/codepages/upcase.dat -rw-r--r-- root/root usr/share/samba/codepages/valid.dat -drwxr-xr-x root/root usr/share/samba/setup/ --rw-r--r-- root/root usr/share/samba/setup/DB_CONFIG -drwxr-xr-x root/root usr/share/samba/setup/ad-schema/ --rw-r--r-- root/root usr/share/samba/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt --rw-r--r-- root/root usr/share/samba/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt --rw-r--r-- root/root usr/share/samba/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt --rw-r--r-- root/root usr/share/samba/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt --rw-r--r-- root/root usr/share/samba/setup/ad-schema/licence.txt --rw-r--r-- root/root usr/share/samba/setup/aggregate_schema.ldif --rw-r--r-- root/root usr/share/samba/setup/cn=replicator.ldif --rw-r--r-- root/root usr/share/samba/setup/cn=samba-admin.ldif --rw-r--r-- root/root usr/share/samba/setup/cn=samba.ldif -drwxr-xr-x root/root usr/share/samba/setup/display-specifiers/ --rw-r--r-- root/root usr/share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt --rw-r--r-- root/root usr/share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt --rw-r--r-- root/root usr/share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt --rw-r--r-- root/root usr/share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt --rw-r--r-- root/root usr/share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt --rw-r--r-- root/root usr/share/samba/setup/dns_update_list --rw-r--r-- root/root usr/share/samba/setup/fedora-ds-init.ldif --rw-r--r-- root/root usr/share/samba/setup/fedorads-dna.ldif --rw-r--r-- root/root usr/share/samba/setup/fedorads-index.ldif --rw-r--r-- root/root usr/share/samba/setup/fedorads-linked-attributes.ldif --rw-r--r-- root/root usr/share/samba/setup/fedorads-pam.ldif --rw-r--r-- root/root usr/share/samba/setup/fedorads-partitions.ldif --rw-r--r-- root/root usr/share/samba/setup/fedorads-refint-add.ldif --rw-r--r-- root/root usr/share/samba/setup/fedorads-refint-delete.ldif --rw-r--r-- root/root usr/share/samba/setup/fedorads-samba.ldif --rw-r--r-- root/root usr/share/samba/setup/fedorads-sasl.ldif --rw-r--r-- root/root usr/share/samba/setup/fedorads.inf --rw-r--r-- root/root usr/share/samba/setup/idmap_init.ldif --rw-r--r-- root/root usr/share/samba/setup/krb5.conf --rw-r--r-- root/root usr/share/samba/setup/memberof.conf --rw-r--r-- root/root usr/share/samba/setup/mmr_serverids.conf --rw-r--r-- root/root usr/share/samba/setup/mmr_syncrepl.conf --rw-r--r-- root/root usr/share/samba/setup/modules.conf --rw-r--r-- root/root usr/share/samba/setup/named.conf --rw-r--r-- root/root usr/share/samba/setup/named.conf.dlz --rw-r--r-- root/root usr/share/samba/setup/named.conf.update --rw-r--r-- root/root usr/share/samba/setup/named.txt --rw-r--r-- root/root usr/share/samba/setup/olc_mmr.conf --rw-r--r-- root/root usr/share/samba/setup/olc_seed.ldif --rw-r--r-- root/root usr/share/samba/setup/olc_serverid.conf --rw-r--r-- root/root usr/share/samba/setup/olc_syncrepl.conf --rw-r--r-- root/root usr/share/samba/setup/olc_syncrepl_seed.conf --rw-r--r-- root/root usr/share/samba/setup/prefixMap.txt --rw-r--r-- root/root usr/share/samba/setup/provision.ldif --rw-r--r-- root/root usr/share/samba/setup/provision.reg --rw-r--r-- root/root usr/share/samba/setup/provision.zone --rw-r--r-- root/root usr/share/samba/setup/provision_basedn.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_basedn_modify.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_basedn_options.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_basedn_references.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_computers_add.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_computers_modify.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_configuration.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_configuration_basedn.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_configuration_modify.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_configuration_references.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_dns_accounts_add.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_dns_add_samba.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_dnszones_add.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_dnszones_modify.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_dnszones_partitions.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_group_policy.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_init.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_partitions.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_privilege.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_rootdse_add.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_rootdse_modify.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_schema_basedn.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_schema_basedn_modify.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_self_join.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_self_join_config.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_self_join_modify.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_self_join_modify_config.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_users.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_users_add.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_users_modify.ldif --rw-r--r-- root/root usr/share/samba/setup/provision_well_known_sec_princ.ldif --rw-r--r-- root/root usr/share/samba/setup/refint.conf --rw-r--r-- root/root usr/share/samba/setup/schema-map-fedora-ds-1.0 --rw-r--r-- root/root usr/share/samba/setup/schema-map-openldap-2.3 --rw-r--r-- root/root usr/share/samba/setup/schema_samba4.ldif --rw-r--r-- root/root usr/share/samba/setup/secrets.ldif --rw-r--r-- root/root usr/share/samba/setup/secrets_dns.ldif --rw-r--r-- root/root usr/share/samba/setup/secrets_init.ldif --rw-r--r-- root/root usr/share/samba/setup/secrets_sasl_ldap.ldif --rw-r--r-- root/root usr/share/samba/setup/secrets_simple_ldap.ldif --rw-r--r-- root/root usr/share/samba/setup/share.ldif --rw-r--r-- root/root usr/share/samba/setup/slapd.conf --rw-r--r-- root/root usr/share/samba/setup/spn_update_list --rw-r--r-- root/root usr/share/samba/setup/ypServ30.ldif drwxr-xr-x root/root var/ drwxr-xr-x root/root var/cache/ drwxr-xr-x root/root var/cache/samba/ diff --git a/samba/.md5sum b/samba/.md5sum index 198020c06..77948d430 100644 --- a/samba/.md5sum +++ b/samba/.md5sum @@ -1,3 +1,5 @@ -448caca4745aef1a842f4fdb1aa62e1e samba +e19e48b72077085b3e91b40382ccf4fa nmbd.rc 9c3bc2fb98fd3bac9945b911c71fdc66 samba-4.1.16.tar.gz -befcb6d70805a641aaaef38550b07725 samba-install_yapp_driver.patch +84266d28273c12045e18ea34c504c296 samba.rc +39ab1b9b9e14334bd6cda98c5d695a73 smbd.rc +33ce88f1559787db43f60e36a98092e7 winbindd.rc diff --git a/samba/Pkgfile b/samba/Pkgfile index ee1f29912..8cdc1da0f 100644 --- a/samba/Pkgfile +++ b/samba/Pkgfile @@ -1,44 +1,53 @@ -# Description: SMB server and client for unix -# URL: http://www.samba.org -# Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: ncurses openssl readline zlib tdb talloc libcap acl libaio popt +# Description: SMB server and client for unix +# URL: http://www.samba.org +# Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve +# Packager: Juergen Daubert, jue at crux dot nu +# Depends on: ncurses openssl readline zlib libcap acl libaio popt p5-parse-yapp krb5 ldb ntdb iniparser subunit py-subunit +# Optional: cups name=samba version=4.1.16 -release=1 -source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \ - samba-install_yapp_driver.patch - samba) +release=2 +source=( +http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz +samba.rc +nmbd.rc +smbd.rc +winbindd.rc +) build () { - cd $name-$version + cd $name-$version - patch -d pidl/lib -p0 -i $SRC/samba-install_yapp_driver.patch + ./configure \ + --enable-fhs \ + --prefix=/usr \ + --localstatedir=/var \ + --mandir=/usr/man \ + --sysconfdir=/etc \ + --with-privatedir=/etc/samba/private \ + --bundled-libraries=NONE \ + --with-system-mitkrb5 - # we should define vendorlib in our perl port - sed -ri 's/(vendor)(arch|lib|prefix)/site\2/' buildtools/wafsamba/samba_perl.py + # we should define vendorlib in our perl port + sed -ri 's/(vendor)(arch|lib|prefix)/site\2/' buildtools/wafsamba/samba_perl.py + make + make DESTDIR=$PKG install - ./configure --enable-fhs \ - --prefix=/usr \ - --localstatedir=/var \ - --mandir=/usr/man \ - --sysconfdir=/etc \ - --with-privatedir=/etc/samba/private - - make - make DESTDIR=$PKG install - - # man pages - local p - for p in docs/manpages/*; do - install -D -m 644 $p $PKG/usr/man/man${p##*.}/${p##*/} - done + # man pages + for i in docs/manpages/*; do + install -D -m 644 $i $PKG/usr/man/man${i##*.}/${i##*/} + done - # cleanup - chmod 1777 $PKG/var/lock + # cleanup + chmod 1777 $PKG/var/lock - # config-file and start-script - install -d $PKG/etc/{samba,rc.d} - install -m 0600 packaging/LSB/smb.conf $PKG/etc/samba/smb.conf.default - install -m 0755 $SRC/samba $PKG/etc/rc.d + # config-file and start-script + install -d $PKG/etc/{samba,rc.d} + install -m 0600 packaging/LSB/smb.conf $PKG/etc/samba/smb.conf.default + + # startup scripts + for i in samba nmbd smbd winbindd; do + install -m 0755 $SRC/$i.rc $PKG/etc/rc.d/$i + done } diff --git a/samba/nmbd.rc b/samba/nmbd.rc new file mode 100755 index 000000000..dd63a07a3 --- /dev/null +++ b/samba/nmbd.rc @@ -0,0 +1,79 @@ +#!/bin/bash + +NAME="nmbd" +USER="root" +RUNDIR="/var/run/samba" +PIDFILE="" +STARTCMD="/usr/sbin/nmbd" +STOPCMD="/usr/bin/smbcontrol $NAME shutdown" +STOPTIMEOUT="300" + +function getpid() { + if [ -z "$PIDFILE" ]; then + pid="$(pgrep -xfn "$STARTCMD")" + else + if [ -f "$PIDFILE" ]; then + pid=$(< $PIDFILE) + if [ ! -d /proc/"$pid" ]; then + echo "$NAME: removing stale pidfile $PIDFILE" >&2 + rm -f "$PIDFILE" + unset pid + fi + fi + fi + echo "$pid" +} + +case $1 in +start) + pid=$(getpid) + install -d -m 755 -o $USER $RUNDIR || exit 1 + if [ -n "$pid" ]; then + echo "$NAME already running with pid $pid" >&2 + exit 1 + fi + eval "$STARTCMD" + ;; +stop) + pid=$(getpid) + if [ -n "$pid" ]; then + if [ -n "$STOPCMD" ]; then + eval "$STOPCMD" + else + kill "$pid" + fi + t=$(printf '%(%s)T' -1) + tend=$((t+STOPTIMEOUT)) + while [ -d /proc/$pid -a $t -lt $tend ]; do + sleep 0.5 + t=$(printf '%(%s)T' -1) + done + if [ -d /proc/"$pid" ]; then + echo "$NAME still running with pid $pid" >&2 + else + [ -n "$PIDFILE" ] && rm -f "$PIDFILE" + fi + else + echo "$NAME is not running" >&2 + fi + ;; +reload) + /usr/bin/smbcontrol $NAME reload-config + ;; +restart) + $0 stop + $0 start + ;; +status) + pid=$(getpid) + if [ -n "$pid" ]; then + echo "$NAME is running with pid $pid" + else + echo "$NAME is not running" + fi + ;; +*) + echo "usage: $0 [start|stop|restart|reload|status]" + ;; +esac + diff --git a/samba/samba-install_yapp_driver.patch b/samba/samba-install_yapp_driver.patch deleted file mode 100644 index c74a62ad8..000000000 --- a/samba/samba-install_yapp_driver.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- wscript_build.orig 2014-07-04 11:51:11.280336055 +0200 -+++ wscript_build 2014-07-04 11:52:11.564922410 +0200 -@@ -28,10 +28,6 @@ - Parse/Pidl/Samba3/ServerNDR.pm - Parse/Pidl/Compat.pm - Parse/Pidl/NDR.pm -+ Parse/Yapp/Driver.pm - ''', - flat=False) -- --if not bld.CONFIG_SET('USING_SYSTEM_PARSE_YAPP_DRIVER'): -- bld.INSTALL_FILES(bld.env.PERL_LIB_INSTALL_DIR, -- 'Parse/Yapp/Driver.pm', -- flat=False) diff --git a/samba/samba.rc b/samba/samba.rc new file mode 100755 index 000000000..2786fbb1a --- /dev/null +++ b/samba/samba.rc @@ -0,0 +1,28 @@ +#!/bin/bash +# +# /etc/rc.d/samba: start/stop all server samba daemons +# + +declare -a scripts=('smbd' 'nmbd' 'winbindd') + +case $1 in +start|reload|status) + for script in ${scripts[@]}; do + /etc/rc.d/$script $1 + done + ;; +stop) + # stop in reverse order + for (( i=${#scripts[@]}-1; i>=0; i-- )); do + script=${scripts[i]} + /etc/rc.d/$script $1 + done + ;; +restart) + $0 stop + $0 start + ;; +*) + echo "usage: $0 [start|stop|restart|reload|status]" + ;; +esac diff --git a/samba/smbd.rc b/samba/smbd.rc new file mode 100755 index 000000000..0c22f3ccb --- /dev/null +++ b/samba/smbd.rc @@ -0,0 +1,79 @@ +#!/bin/bash + +NAME="smbd" +USER="root" +RUNDIR="/var/run/samba" +PIDFILE="" +STARTCMD="/usr/sbin/smbd" +STOPCMD="/usr/bin/smbcontrol $NAME shutdown" +STOPTIMEOUT="300" + +function getpid() { + if [ -z "$PIDFILE" ]; then + pid="$(pgrep -xfn "$STARTCMD")" + else + if [ -f "$PIDFILE" ]; then + pid=$(< $PIDFILE) + if [ ! -d /proc/"$pid" ]; then + echo "$NAME: removing stale pidfile $PIDFILE" >&2 + rm -f "$PIDFILE" + unset pid + fi + fi + fi + echo "$pid" +} + +case $1 in +start) + pid=$(getpid) + install -d -m 755 -o $USER $RUNDIR || exit 1 + if [ -n "$pid" ]; then + echo "$NAME already running with pid $pid" >&2 + exit 1 + fi + eval "$STARTCMD" + ;; +stop) + pid=$(getpid) + if [ -n "$pid" ]; then + if [ -n "$STOPCMD" ]; then + eval "$STOPCMD" + else + kill "$pid" + fi + t=$(printf '%(%s)T' -1) + tend=$((t+STOPTIMEOUT)) + while [ -d /proc/$pid -a $t -lt $tend ]; do + sleep 0.5 + t=$(printf '%(%s)T' -1) + done + if [ -d /proc/"$pid" ]; then + echo "$NAME still running with pid $pid" >&2 + else + [ -n "$PIDFILE" ] && rm -f "$PIDFILE" + fi + else + echo "$NAME is not running" >&2 + fi + ;; +reload) + /usr/bin/smbcontrol $NAME reload-config + ;; +restart) + $0 stop + $0 start + ;; +status) + pid=$(getpid) + if [ -n "$pid" ]; then + echo "$NAME is running with pid $pid" + else + echo "$NAME is not running" + fi + ;; +*) + echo "usage: $0 [start|stop|restart|reload|status]" + ;; +esac + diff --git a/samba/winbindd.rc b/samba/winbindd.rc new file mode 100755 index 000000000..4bcfa490d --- /dev/null +++ b/samba/winbindd.rc @@ -0,0 +1,79 @@ +#!/bin/bash + +NAME="winbindd" +USER="root" +RUNDIR="/var/run/samba" +PIDFILE="" +STARTCMD="/usr/sbin/winbindd" +STOPCMD="/usr/bin/smbcontrol $NAME shutdown" +STOPTIMEOUT="300" + +function getpid() { + if [ -z "$PIDFILE" ]; then + pid="$(pgrep -xfn "$STARTCMD")" + else + if [ -f "$PIDFILE" ]; then + pid=$(< $PIDFILE) + if [ ! -d /proc/"$pid" ]; then + echo "$NAME: removing stale pidfile $PIDFILE" >&2 + rm -f "$PIDFILE" + unset pid + fi + fi + fi + echo "$pid" +} + +case $1 in +start) + pid=$(getpid) + install -d -m 755 -o $USER $RUNDIR || exit 1 + if [ -n "$pid" ]; then + echo "$NAME already running with pid $pid" >&2 + exit 1 + fi + eval "$STARTCMD" + ;; +stop) + pid=$(getpid) + if [ -n "$pid" ]; then + if [ -n "$STOPCMD" ]; then + eval "$STOPCMD" + else + kill "$pid" + fi + t=$(printf '%(%s)T' -1) + tend=$((t+STOPTIMEOUT)) + while [ -d /proc/$pid -a $t -lt $tend ]; do + sleep 0.5 + t=$(printf '%(%s)T' -1) + done + if [ -d /proc/"$pid" ]; then + echo "$NAME still running with pid $pid" >&2 + else + [ -n "$PIDFILE" ] && rm -f "$PIDFILE" + fi + else + echo "$NAME is not running" >&2 + fi + ;; +reload) + /usr/bin/smbcontrol $NAME reload-config + ;; +restart) + $0 stop + $0 start + ;; +status) + pid=$(getpid) + if [ -n "$pid" ]; then + echo "$NAME is running with pid $pid" + else + echo "$NAME is not running" + fi + ;; +*) + echo "usage: $0 [start|stop|restart|reload|status]" + ;; +esac + -- cgit v1.2.3