diff options
Diffstat (limited to 'net/samba3/files')
| -rw-r--r-- | net/samba3/files/README.FreeBSD | 34 | ||||
| -rw-r--r-- | net/samba3/files/patch-aj | 15 | ||||
| -rw-r--r-- | net/samba3/files/patch-configure.in | 18 | ||||
| -rw-r--r-- | net/samba3/files/patch-lib_module.c | 15 | ||||
| -rw-r--r-- | net/samba3/files/patch-lib_util_str.c | 23 | ||||
| -rw-r--r-- | net/samba3/files/patch-rpcclient_cmd_reg.c | 15 | ||||
| -rw-r--r-- | net/samba3/files/patch-smbd_quotas.c | 10 |
7 files changed, 24 insertions, 106 deletions
diff --git a/net/samba3/files/README.FreeBSD b/net/samba3/files/README.FreeBSD index bb9141e73c2f..fc1e790897f0 100644 --- a/net/samba3/files/README.FreeBSD +++ b/net/samba3/files/README.FreeBSD @@ -1,21 +1,35 @@ -If you want to use samba ports, +If you want to run this samba port: 1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf, and edit it. 2. Put string 'samba_enable="YES"' into your /etc/rc.conf. 3. Type '/usr/local/etc/rc.d/samba.sh start' or reboot. +This port doesn't create 'smbpasswd' file automatically anymore. Users +are encouraged to use 'tdbsam' backend instead: + + [global] + passdb backend = tdbsam, smbpasswd + +You can use pdbedit to migrate accounts from 'smbpasswd' to 'tdbsam', +see the Samba-HOWTO-Collection. + +You still can create 'smbpasswd' file with the supplied 'make_smbpasswd' +script: + + cat /etc/passwd | grep -v "^#" | make_smbpasswd > smbpasswd + chmod 600 smbpasswd + +But the usage of it is deprecated. + See document files in /usr/local/share/doc/samba and example config files in /usr/local/share/examples/samba for details. -FreeBSD Samba ports for localization and encrypt passwords support are no -longer provided because these supports have been integrated into the -original distribution since 1.9.18. If you're Western European or Japanese -Windows users, please set "client code page" parameter in smb.conf (1.9.18 -does not support Chinese Windows. If you want to use Chinese samba, please -use chinese/samba port). See smb.conf.sample for details. If you want to -use NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to -yes and use smbpasswd [username] to use /usr/local/private/smbpasswd for -authentication. +This port doesn't come anymore with the IDEALX Samba LDAP management tools. +They are a separate port now, net/smbldap-tools. Please, install it, if you +are going to use Samba LDAP back end. + +Japanese users, please, take a look onto japanese/samba3 port instead - +it comes with additional multibyte characters support. FreeBSD Samba3 port maintainer: Timur Bakeyev <timur@gnu.org> diff --git a/net/samba3/files/patch-aj b/net/samba3/files/patch-aj deleted file mode 100644 index 8804493c38df..000000000000 --- a/net/samba3/files/patch-aj +++ /dev/null @@ -1,15 +0,0 @@ ---- include/local.h.orig Fri Jul 6 03:01:26 2001 -+++ include/local.h Tue Oct 16 17:20:36 2001 -@@ -176,10 +176,10 @@ - * Default passwd chat script. - */ - --#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*" -+#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n" - - /* Minimum length of allowed password when changing UNIX password. */ --#define MINPASSWDLENGTH 5 -+#define MINPASSWDLENGTH 6 - - /* maximum ID number used for session control. This cannot be larger - than 62*62 for the current code */ diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in index 0c42138e7b91..acf85135f9f5 100644 --- a/net/samba3/files/patch-configure.in +++ b/net/samba3/files/patch-configure.in @@ -37,21 +37,3 @@ # Assume non-shared by default and override below BLDSHARED="false" -@@ -3939,7 +3953,7 @@ - AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available]) - ACL_LIBS="$ACL_LIBS -lpacl" - ;; -- *freebsd5*) -+ *freebsd[[5-9]]*) - AC_MSG_RESULT(Using FreeBSD posix ACLs) - AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether FreeBSD POSIX ACLs are available]) - AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available]) -@@ -4258,7 +4272,7 @@ - *linux*) - WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o" - ;; -- *freebsd5*) -+ *freebsd[[5-9]]*) - # FreeBSD winbind client is implemented as a wrapper around - # the Linux version. - WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \ diff --git a/net/samba3/files/patch-lib_module.c b/net/samba3/files/patch-lib_module.c deleted file mode 100644 index 03cb509895bc..000000000000 --- a/net/samba3/files/patch-lib_module.c +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/module.c.orig Sun Nov 21 00:14:24 2004 -+++ lib/module.c Sun Nov 21 00:38:36 2004 -@@ -40,9 +40,11 @@ - */ - handle = sys_dlopen(module_name, RTLD_LAZY); - -+ /* This call should reset any possible non-fatal errors that -+ occured since last call to dl* functions */ -+ error = sys_dlerror(); - if(!handle) { - int level = is_probe ? 3 : 0; -- error = sys_dlerror(); - DEBUG(level, ("Error loading module '%s': %s\n", module_name, error ? error : "")); - return NT_STATUS_UNSUCCESSFUL; - } diff --git a/net/samba3/files/patch-lib_util_str.c b/net/samba3/files/patch-lib_util_str.c deleted file mode 100644 index 9ade987532f2..000000000000 --- a/net/samba3/files/patch-lib_util_str.c +++ /dev/null @@ -1,23 +0,0 @@ ---- lib/util_str.c.orig Wed Dec 15 15:33:12 2004 -+++ lib/util_str.c Fri Dec 17 02:15:34 2004 -@@ -2008,10 +2008,16 @@ - { - int bits = 0; - int char_count = 0; -- size_t out_cnt = 0; -- size_t len = data.length; -- size_t output_len = data.length * 2; -- char *result = SMB_MALLOC(output_len); /* get us plenty of space */ -+ size_t out_cnt, len, output_len; -+ char *result; -+ -+ if (!data.length || !data.data) -+ return NULL; -+ -+ out_cnt = 0; -+ len = data.length; -+ output_len = data.length * 2; -+ result = SMB_MALLOC(output_len); /* get us plenty of space */ - - while (len-- && out_cnt < (data.length * 2) - 5) { - int c = (unsigned char) *(data.data++); diff --git a/net/samba3/files/patch-rpcclient_cmd_reg.c b/net/samba3/files/patch-rpcclient_cmd_reg.c deleted file mode 100644 index dc8a5726b678..000000000000 --- a/net/samba3/files/patch-rpcclient_cmd_reg.c +++ /dev/null @@ -1,15 +0,0 @@ ---- rpcclient/cmd_reg.c.orig Sun Apr 4 09:37:28 2004 -+++ rpcclient/cmd_reg.c Thu May 20 14:18:36 2004 -@@ -905,7 +905,11 @@ - int opt; - - *msg = 0; -- optind = 0; /* TODO: test if this hack works on other systems too --simo */ -+#ifdef HAVE_OPTRESET -+ optreset = optind = 1; -+#else -+ optind = 0; -+#endif - - while ((opt = getopt(argc, argv, "m:t:rf")) != EOF) - { diff --git a/net/samba3/files/patch-smbd_quotas.c b/net/samba3/files/patch-smbd_quotas.c deleted file mode 100644 index cbd52b0c76dc..000000000000 --- a/net/samba3/files/patch-smbd_quotas.c +++ /dev/null @@ -1,10 +0,0 @@ ---- smbd/quotas.c.orig Wed Sep 1 17:43:45 2004 -+++ smbd/quotas.c Wed Sep 1 17:44:32 2004 -@@ -938,7 +938,6 @@ - #include <rpc/rpc.h> - #include <rpc/types.h> - #include <rpcsvc/rquota.h> --#include <rpc/nettype.h> - #include <rpc/xdr.h> - - static int quotastat; |