From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 4 Apr 2007 08:59:42 +0000 (+0000)
Subject: Pre-ports from 2.5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=df3e71a13f6f4b0b875e234e6609bc4ed5962fe3;p=gosa.git

Pre-ports from 2.5


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5972 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/plugins/admin/groups/generic.tpl b/plugins/admin/groups/generic.tpl
index 141bcbf58..1ccd5cab0 100644
--- a/plugins/admin/groups/generic.tpl
+++ b/plugins/admin/groups/generic.tpl
@@ -56,7 +56,7 @@
 	<LABEL for="gidNumber">{t}Force GID{/t}</LABEL>
       &nbsp;
 {render acl=$gidNumberACL}
-      <input name="gidNumber" size=5 maxlength=5 id="gidNumber" {$forceMode} value="{$gidNumber}" title="{t}Forced ID number{/t}">
+      <input name="gidNumber" size=9 maxlength=9 id="gidNumber" {$forceMode} value="{$gidNumber}" title="{t}Forced ID number{/t}">
 {/render}
      </td>
     </tr>
diff --git a/plugins/personal/posix/generic.tpl b/plugins/personal/posix/generic.tpl
index 7f55d6ec8..cb5f443ac 100644
--- a/plugins/personal/posix/generic.tpl
+++ b/plugins/personal/posix/generic.tpl
@@ -52,7 +52,7 @@
 					</td>
 					<td>
 	{render acl=$uidNumberACL}
-						<input id="uidNumber" name="uidNumber" size=5 maxlength=5 {$forceMode} value="{$uidNumber}">
+						<input id="uidNumber" name="uidNumber" size=9 maxlength=9 {$forceMode} value="{$uidNumber}">
 	{/render}
 					</td>
 				</tr>
@@ -63,7 +63,7 @@
 					</td>
      <td>
 	{render acl=$gidNumberACL}
-						<input id="gidNumber" name="gidNumber" size=5 maxlength=5 {$forceMode} value="{$gidNumber}">
+						<input id="gidNumber" name="gidNumber" size=9 maxlength=9 {$forceMode} value="{$gidNumber}">
 	{/render}
 					</td>
 				</tr>
diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index c99544ea5..879f4e6ba 100644
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -646,6 +646,16 @@ class sambaAccount extends plugin
     unset($this->attrs['uid']);
     unset($this->attrs['uidNumber']);
     unset($this->attrs['gidNumber']);
+
+    /* Remove objectClass for sambaIdmapEntry */
+    $tmp= array();
+    for ($i= 0; $i<count($this->attrs["objectClass"]); $i++){
+      if ($this->attrs['objectClass'][$i] != 'sambaIdmapEntry'){
+        $tmp[]= $this->attrs['objectClass'][$i];
+      }
+    }
+    $this->attrs['objectClass']= $tmp;
+
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
     $ldap->cd($this->dn);