X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Facl_definition.inc;h=12a0442e4939bde2b712695b0920f125841fe4d3;hb=e69acdd83d6356ed714dec516ced0e1c78270ab6;hp=5d49aaf5466d21a5523b2ba279dcf1adb82a3523;hpb=7eb1d613662cc376a39bf492cc62a7f8c6dfe903;p=gosa.git

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index 5d49aaf54..12a0442e4 100644
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -156,37 +156,53 @@ $ACLD['posix']=      array("allowedHosts",
 			"shadowMin",
 			"shadowWarning",
 			"uidNumber");
-$ACLD['samba']=      array("acctFlags",
-			"allow_pwchange",
-			"homeDrive",
-			"no_password_required",
-			"profilePath",
-			"scriptPath",
-			"smbHome",
-			"temporary_disable");
+$ACLD['samba']=      
+			array("acctFlags" => "samba2:acctFlags", 
+			"allow_pwchange" => "samba2:allow_pwchange",
+			"homeDrive" 	=> "samba2:homeDrive",
+			"no_password_required" => "samba2:no_password_required",
+			"profilePath"		=> "samba2:profilePath",
+			"scriptPath" => "samba2:scriptPath",
+			"smbHome" => "samba2:smbHome",
+			"temporary_disable" => "samba2:temporary_disable",
+			 	        "sambaHomePath"		,//=> _("Home path"), 
+						"sambaHomeDrive"	,//=> _("Home drive"), 
+						"sambaDomainName"	,//=> _("Samba domain name"),
+						"sambaLogonScript"	,//=> _("Logon script"),
+				        "sambaProfilePath"	,//=> _("Profile path"),	 
 
-$ACLD['samba'] = array (
-						"sambaLogonTime"	=> _("Limit Logon Time"),
-						"sambaLogoffTime" 	=> _("Limit Logoff Time"), 
-						"sambaKickoffTime" 	=> _("Account expiry"), 	
-						"sambaPwdCanChange"	=> _("Can change password"),
-						"sambaPwdMustChange"=> _("Password expiry"), 
-			 	        "sambaHomePath"		=> _("Home path"), 
-						"sambaHomeDrive"	=> _("Home drive"), 
-						"sambaLogonScript"	=> _("Logon script"),
-				        "sambaProfilePath"	=> _("Profile path"),	 
-						"sambaDomainName"	=> _("Samba domain name"),
-						"allow_pwchange"	=> _("Allow password change"),
-						"no_password_required" => _("Login from windows client requires no password"),
-						"temporary_disable" => _("Lock account"),
-						"sambaUserWorkstation"=> _("Allow connection from these workstations only"),
-						"connectclientdrives"	=> _("Connect client drives at logon"),
-						"connectclientprinters" => _("Connect client printers at logon"),
-						"defaultprinter"	 	=> _("Default to main client printer"),
-						"shadow"				=> _("Shadowing"),
-						"brokenconn"			=> _("On broken or timed out"),
-						"reconn"				=> _("Reconnect if disconnected"),
-						"inherit"				=> _("Inherit client config")
+						"sambaLogonTime",//	=> _("Limit Logon Time"),
+						"sambaLogoffTime",// 	=> _("Limit Logoff Time"), 
+						"sambaKickoffTime",// 	=> _("Account expiry"), 	
+						"sambaPwdCanChange",//	=> _("Can change password"),
+						"sambaPwdMustChange",//=> _("Password expiry"), 
+						"allow_pwchange"	,//=> _("Allow password change"),
+						"no_password_required",// => _("Login from windows client requires no password"),
+						"temporary_disable",// => _("Lock account"),
+						"sambaUserWorkstation",//=> _("Allow connection from these workstations only"),
+
+						"connectclientdrives",//	=> _("Connect client drives at logon"),
+						"connectclientprinters",// => _("Connect client printers at logon"),
+						"defaultprinter",//	 	=> _("Default to main client printer"),
+
+						"shadow",//				=> _("Shadowing"),
+						"brokenconn",//			=> _("On broken or timed out"),
+						"reconn",//				=> _("Reconnect if disconnected"),
+
+						"inherit",//				=> _("Inherit client config")
+						"tslogin",//				=> _("Inherit client config")
+		
+						"CtxWFHomeDir",
+						"CtxWFHomeDirDrive",
+						"CtxWFProfilePath",
+
+						"CtxMaxConnectionTime",
+						"CtxMaxDisconnectionTime",
+						"CtxMaxIdleTime",
+
+						"CtxInitialProgram",
+						"CtxWorkDirectory"
+				
 						) ;
 
 
@@ -245,8 +261,25 @@ $ACLD['intranetAccount']		=array("intranetAccount" 		);
 $ACLD['pptpAccount']			=array("gosapptp" 	  			);
 $ACLD['phpscheduleitAccount']	=array("gosaphpscheduleit" 	  	);
 
-$ACLD['goFonAccount'] = array("goFonDeliveryMode", "goFonFormat",
-      "goFonHardware","goFonPIN","goFonVoicemailPIN","telephoneNumber", "goFonMacro","macro");
+$ACLD['phoneAccount'] = array("goFonDeliveryMode",
+      "goFonHardware","goFonPIN","goFonVoicemailPIN","telephoneNumber", "goFonMacro");
+
+$ACLD['nagiosAccount'] = array("NagiosAlias"
+, "NagiosPager"
+, "NagiosMail"
+, "HostNotificationPeriod"
+, "ServiceNotificationPeriod"
+, "HostNotificationCommands"
+, "ServiceNotificationCommands"
+, "HostNotificationOptions"
+, "ServiceNotificationOptions"
+, "AuthorizedAllHosts"
+, "AuthorizedAllServices"
+, "AuthorizedSystemCommands"
+, "AuthorizedAllHostCommands"
+, "AuthorizedAllServiceCommands"
+, "AuthorizedConfigurationInformation"
+, "AuthorizedSystemInformation");
 
 $ACLD['global-addressbook']=  array("create", "delete");
 ?>