Changeset 12f279ef4f9d

Timestamp:

09/06/11 16:22:42 (8 months ago)

Author:

Mahlon E. Smith <mahlon@…>

Branch:

default

Tags:

0.5

Message:

Backout the additional objectClasses patch for mkdir: same behavior can
be acheived with 'touch', less complex to leave it as is.

File:

• shelldap (modified) (3 diffs)

shelldap

@@ -312 +312 @@
 =item B<mkdir>
 
-Creates a new entry. The type of object created depends on
-the naming attribute given, and defaults to 'organizationalUnit'
-if none is given.
-Supported naming attributes and corresponding object classes are:
-    c   - country
-    o   - organization
-    ou  - organizationalUnit
-
-    mkdir myNewOrgUnit
-    mkdir o=myNewOrg
+Creates a new 'organizationalUnit' entry.
+
+    mkdir containername
+    mkdir ou=whatever
 
 =item B<move>
@@ -1577 +1571 @@
     my $self = shift;
     my $dir  = join ' ', @_;
-    my %ClassMap = ( c => 'country',
-             o => 'organization',
-             ou => 'organizationalUnit' );
-    my %class;
 
     unless ( $dir ) {
@@ -1587 +1577 @@
     }
 
-    # convert given path to DN
+    # normalize name, if it is not yet a legal DN
+    $dir = 'ou=' . $dir unless canonical_dn( $dir );
+
+    # convert given path to full DN
     $dir = $self->path_to_dn( $dir );
 
-    # normalize name, if it is not yet a legal DN
-    $dir = 'ou='.$dir  if (!canonical_dn($dir));
-
     # get RDN: naming attributes (lower-case) and their values
-        my %rdn = %{ shift(@{ ldap_explode_dn($dir, casefold => 'lower') }) };
-
-    # without RDN, return error
-    unless ( %rdn ) {
-        print "Illegal DN: $dir\n";
-        return;
-    }
-
-    # get objectclass from naming attributes
-    foreach my $attr (keys(%rdn)) {
-        map { $class{$ClassMap{$_}} = 1  if ($attr =~ /^\Q$_\E$/); }
-            keys(%ClassMap);
-    }
-
-    # fail if we did not get a unique objectclass
-    unless (scalar(keys(%class)) == 1) {
-        print "Unsupported DN: $dir\n";
-        return;
-    }
-
-    # create the new object
-    my $r = $self->ldap()->add($dir,
-                   attr => [ objectClass => [ 'top', keys(%class) ],
-                         %rdn ]);
+    my %rdn = %{ shift(@{ ldap_explode_dn($dir, casefold => 'lower') }) };
+
+    # add
+    my $r = $self->ldap()->add( $dir, attr => [
+        objectClass => [ 'top', 'organizationalUnit' ], %rdn
+    ]);
 
     print $r->error(), "\n";