ispman/bin ispman.deleteUser,1.3.6.1,1.3.6.2

Update of /cvsroot/ispman/ispman/bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14027/bin

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain
	ispman.deleteUser 
Log Message:
Fixed bin/ispman.deleteUser.


Index: ispman.deleteUser
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.deleteUser,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -d -r1.3.6.1 -r1.3.6.2
--- ispman.deleteUser	8 Sep 2006 13:15:38 -0000	1.3.6.1
+++ ispman.deleteUser	2 Oct 2006 08:57:38 -0000	1.3.6.2
@@ -21,15 +21,12 @@
 $ispmanDomain = $domain;
 
 if ( $ISPMan::Config->{'AllowFullEmailLogins'} ) {
-    if ( $ISPMan::Config->{'CyrusUnixHierarchySep'} ) {
-        $user = ~s/\./\\./g;
-    }
-    $domain =~ s/\./\\./g;
-    $uid = join '\@', ( $user, $domain );
+    $uid = join '@', ( $user, $domain );
 } else {
     $domain =~ s/\./_/g;
     $uid = join '_', ( $user, $domain );
 }
+$ispmanDomain = $domain;
 
 my $dn = $ispman->getUserDN( $ispmanDomain, $uid );
 if ( $ispman->entryExists($dn) ) {


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV