From e76965e9cecaa2ec38f151a86ca7dddd45a16896 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 1 Mar 2008 18:59:12 +0000
Subject: [PATCH] Make example user a person

---
 ldap-server/create.cgi         |  3 ++-
 ldap-server/ldap-server-lib.pl | 14 ++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/ldap-server/create.cgi b/ldap-server/create.cgi
index f8475ba7e..20d49be06 100644
--- a/ldap-server/create.cgi
+++ b/ldap-server/create.cgi
@@ -59,12 +59,13 @@ if ($ok && $in{'example'}) {
 		# User
 		$edn = "uid=example, ".$dn;
 		@attrs = ( "cn", "Example user",
+			   "sn", "Example user",
 			   "uid", "example",
 			   "uidNumber", 9999,
 			   "gidNumber", 9999,
 			   "loginShell", "/bin/sh",
 			   "homeDirectory", "/home/example",
-			   "objectClass", [ "posixAccount" ],
+			   "objectClass", [ "posixAccount", "person" ],
 			   "userPassword", "*LK*" );
 		if ($in{'example'} == 2) {
 			# With mail
diff --git a/ldap-server/ldap-server-lib.pl b/ldap-server/ldap-server-lib.pl
index d42f4baa5..665a0128d 100644
--- a/ldap-server/ldap-server-lib.pl
+++ b/ldap-server/ldap-server-lib.pl
@@ -486,12 +486,7 @@ sub store_ldap_access
 {
 local ($a, $p) = @_;
 local @v = ( 'to' );
-if ($p->{'what'} =~ /^\S+$/) {
-	push(@v, $p->{'what'});
-	}
-else {
-	push(@v, "\"$p->{'what'}\"");
-	}
+push(@v, $p->{'what'});
 if ($p->{'filter'}) {
 	push(@v, "filter=$p->{'filter'}");
 	}
@@ -500,12 +495,7 @@ if ($p->{'attrs'}) {
 	}
 foreach my $b (@{$p->{'by'}}) {
 	push(@v, "by");
-	if ($b->{'who'} =~ /^\S+$/) {
-		push(@v, $b->{'who'});
-		}
-	else {
-		push(@v, "\"$b->{'who'}\"");
-		}
+	push(@v, $b->{'who'});
 	push(@v, $b->{'access'});
 	push(@v, @{$b->{'control'}});
 	}