diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-04-17 16:10:50 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-04-17 16:10:50 +0000 |
| commit | bc110054fdb8cb1555e433583230a4903e02aa19 (patch) | |
| tree | 0bf75ba85cb1781352a0a9f24048dfec7ac0896b /net/samba3/files | |
| parent | 8de16c7c50a7131e3370d3c37c06568f5fe4c556 (diff) | |
| download | ports-bc110054fdb8cb1555e433583230a4903e02aa19.tar.gz ports-bc110054fdb8cb1555e433583230a4903e02aa19.zip | |
Notes
Diffstat (limited to 'net/samba3/files')
| -rw-r--r-- | net/samba3/files/patch-smbd_dir.c | 20 | ||||
| -rw-r--r-- | net/samba3/files/samba.sh.sample | 7 |
2 files changed, 3 insertions, 24 deletions
diff --git a/net/samba3/files/patch-smbd_dir.c b/net/samba3/files/patch-smbd_dir.c deleted file mode 100644 index e7a7a87ec83b..000000000000 --- a/net/samba3/files/patch-smbd_dir.c +++ /dev/null @@ -1,20 +0,0 @@ -## -## See https://bugzilla.samba.org/bug/2501 for details -## -diff -urBb --exclude-from=samba-cvs/diff.excludes samba-3.0.12-orig/source/smbd/dir.c samba-3.0.12/source/smbd/dir.c ---- smbd/dir.c.orig 2005-03-18 08:56:41.000000000 -0600 -+++ smbd/dir.c 2005-03-21 12:51:56.541216536 -0600 -@@ -595,6 +595,13 @@ - BOOL dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset, SMB_STRUCT_STAT *pst) - { - ZERO_STRUCTP(pst); -+ -+ if (!dptr->has_wild && (dptr->dir_hnd->offset == -1)) { -+ /* This is a singleton directory and we're already at the end. */ -+ *poffset = -1; -+ return False; -+ } -+ - while (SearchDir(dptr->dir_hnd, name, poffset) == True) { - if (is_visible_file(dptr->conn, dptr->path, name, pst, True)) { - return True; diff --git a/net/samba3/files/samba.sh.sample b/net/samba3/files/samba.sh.sample index 15476b31d399..9c154b130fab 100644 --- a/net/samba3/files/samba.sh.sample +++ b/net/samba3/files/samba.sh.sample @@ -18,6 +18,7 @@ # #nmbd_enable="YES" #smbd_enable="YES" +%%WINBIND%%# You need to enable winbindd separately, by adding: %%WINBIND%%#winbindd_enable="YES" # @@ -41,11 +42,9 @@ fi if test -n ${samba_enable:-""} && checkyesno samba_enable; then nmbd_enable=${nmbd_enable:-"YES"} smbd_enable=${smbd_enable:-"YES"} -%%WINBIND%% winbindd_enable=${winbindd_enable:-"YES"} %%WINBIND%% # Check, that winbind is actally configured -%%WINBIND%% if [ ! "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then -%%WINBIND%% #warn "Winbind support is not configured" -%%WINBIND%% winbindd_enable="NO" +%%WINBIND%% if [ "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then +%%WINBIND%% winbindd_enable="YES" %%WINBIND%% fi fi |