Mercurial Mercurial > sustaining > oi_151a > sfw-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
usr/src/cmd/samba/samfs-param_loadparm.c-diff
author Cyril Plisko <cyril.plisko@grigale.com>
Sat, 26 Jun 2010 23:31:21 -0700
changeset 17 4c6e1d5e1470
parent 0 b34509ac961f
permissions -rw-r--r--
Import sfw build 143 Bugs Fixed ---------- 6934319 Update gnuplot to version 4.4 6960032 update gocr to newer version 6961961 CVE-2010-2063 in Samba 3.3.x and below, a buffer overrun is possible in chain_reply code. 6962388 Wireshark update to version 1.2.9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     1
 
--- loadparm.c	Thu Sep 11 08:19:03 2008
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     2
 
+++ samba-3.0.32/source/param/loadparm.c	Thu Sep 11 08:24:32 2008
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     3
 
@@ -449,6 +449,7 @@
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     4
 
 	BOOL bProfileAcls;
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     5
 
 	BOOL bMap_acl_inherit;
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     6
 
 	BOOL bAfs_Share;
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     7
 
+	BOOL bSamfs_Share;
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     8
 
 	BOOL bEASupport;
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     9
 
 	BOOL bAclCheckPermissions;
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    10
 
 	BOOL bAclMapFullControl;
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    11
 
@@ -592,6 +593,7 @@
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    12
 
 	False,			/* bProfileAcls */
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    13
 
 	False,			/* bMap_acl_inherit */
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    14
 
 	False,			/* bAfs_Share */
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    15
 
+	False,			/* bSamfs_Share */
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    16
 
 	False,			/* bEASupport */
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    17
 
 	True,			/* bAclCheckPermissions */
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    18
 
 	True,			/* bAclMapFullControl */
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    19
 
@@ -1015,6 +1017,7 @@
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    20
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    21
 
 	{"enable asu support", P_BOOL, P_GLOBAL, &Globals.bASUSupport, NULL, NULL, FLAG_ADVANCED},
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    22
 
 	{"svcctl list", P_LIST, P_GLOBAL, &Globals.szServicesList, NULL, NULL, FLAG_ADVANCED},
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    23
 
+	{"samfs share", P_BOOL, P_LOCAL, &sDefault.bSamfs_Share, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL},
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    24
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    25
 
 	{N_("Tuning Options"), P_SEP, P_SEPARATOR},
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    26
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    27
 
@@ -2137,6 +2140,7 @@
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    28
 
 FN_LOCAL_BOOL(lp_profile_acls, bProfileAcls)
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    29
 
 FN_LOCAL_BOOL(lp_map_acl_inherit, bMap_acl_inherit)
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    30
 
 FN_LOCAL_BOOL(lp_afs_share, bAfs_Share)
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    31
 
+FN_LOCAL_BOOL(lp_samfs_share, bSamfs_Share)
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    32
 
 FN_LOCAL_BOOL(lp_acl_check_permissions, bAclCheckPermissions)
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    33
 
 FN_LOCAL_BOOL(lp_acl_group_control, bAclGroupControl)
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    34
 
 FN_LOCAL_BOOL(lp_acl_map_full_control, bAclMapFullControl)
sustaining/oi_151a/sfw-gate