ispman/lib/ISPMan UserMan.pm,1.37,1.38

[email protected]
Newsgroups gmane.comp.isp.ispman.cvs
Message-ID <[email protected]>
Update of /cvsroot/ispman/ispman/lib/ISPMan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3536/lib/ISPMan

Modified Files:
	UserMan.pm 
Log Message:
fixed bug #891748 (deleting user without mailbox)
this bug was actually just a side effect from some bogus LDAP attributes (see bug comments)
notice: run ldifupdate to fix your LDAP data

Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- UserMan.pm	26 Jan 2004 20:33:03 -0000	1.37
+++ UserMan.pm	7 Feb 2004 14:57:57 -0000	1.38
@@ -246,10 +246,22 @@
 
    # passing domain, username, process and username,homedirecory,uid,gid  as params
 
-   $self->addUserFileServerProcess($self->{'user'}{'ispmanDomain'}, $self->{'user'}{'uid'}, 'deleteHomeDirectory',
-   join ',', ($self->{'user'}{'uid'}, $self->{'user'}{'homeDirectory'}, $self->{'user'}{'uidNumber'},$self->{'user'}{'gidNumber'}));
-   if ($self->{'user'}{"mailHost"}=~/\S/) {
-        $self->addProcessToHost($self->{'user'}{'ispmanDomain'}, $self->{'user'}{"mailHost"}, "deleteMailbox", join "", ($self->getConf("imapMailboxPrefix"), $self->{'user'}{'uid'}));
+   $self->addUserFileServerProcess($self->{'user'}{'ispmanDomain'},
+				   $self->{'user'}{'uid'},
+				   'deleteHomeDirectory',
+				   join ',',
+				      ($self->{'user'}{'uid'},
+				       $self->{'user'}{'homeDirectory'},
+				       $self->{'user'}{'uidNumber'},
+				       $self->{'user'}{'gidNumber'}));
+
+   if ($self->{'user'}{"mailHost"}) {
+       $self->addProcessToHost($self->{'user'}{'ispmanDomain'},
+			       $self->{'user'}{"mailHost"},
+			       "deleteMailbox",
+			       join "",
+			           ($self->getConf("imapMailboxPrefix"),
+				    $self->{'user'}{'uid'}));
    }
    $self->deleteEntry($dn)
 }



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.