Save ID when creating a user
authorJamie Cameron <jcameron@webmin.com>
Sat, 18 Sep 2010 06:49:23 +0000 (23:49 -0700)
committerJamie Cameron <jcameron@webmin.com>
Sat, 18 Sep 2010 06:49:23 +0000 (23:49 -0700)
acl/acl-lib.pl
web-lib-funcs.pl

index 169518a..3402140 100755 (executable)
@@ -327,6 +327,8 @@ if ($miniserv{'userdb'} && !$miniserv{'userdb_addto'}) {
                                        $dbh->errstr);
                        $cmd->finish();
                        }
+               $_[0]->{'id'} = $id;
+               $_[0]->{'proto'} = $proto;
                }
        elsif ($proto eq "ldap") {
                # Add user to LDAP
@@ -356,7 +358,8 @@ if ($miniserv{'userdb'} && !$miniserv{'userdb_addto'}) {
                        &error("Failed to add user to LDAP : ".
                               ($rv ? $rv->error : "Unknown error"));
                        }
-
+               $_[0]->{'id'} = $dn;
+               $_[0]->{'proto'} = 'ldap';
                }
        &disconnect_userdb($miniserv{'userdb'}, $dbh);
        $user{'proto'} = $proto;
@@ -879,6 +882,8 @@ if ($miniserv{'userdb'} && !$miniserv{'userdb_addto'}) {
                                        $dbh->errstr);
                        $cmd->finish();
                        }
+               $_[0]->{'id'} = $id;
+               $_[0]->{'proto'} = $proto;
                }
        elsif ($proto eq "ldap") {
                # Add group to LDAP
@@ -907,6 +912,8 @@ if ($miniserv{'userdb'} && !$miniserv{'userdb_addto'}) {
                        &error("Failed to add group to LDAP : ".
                               ($rv ? $rv->error : "Unknown error"));
                        }
+               $_[0]->{'id'} = $dn;
+               $_[0]->{'proto'} = 'ldap';
                }
        &disconnect_userdb($miniserv{'userdb'}, $dbh);
        $group{'proto'} = $proto;
index c073dde..184c538 100755 (executable)
@@ -9187,7 +9187,6 @@ if ($proto eq "mysql") {
        $cstr .= ";port=$port" if ($port);
        my $dbh = $drh->connect($cstr, $user, $pass, { });
        $dbh || return &text('sql_emysqlconnect', $drh->errstr);
-       $dbh->{'AutoCommit'} = 1;
        return wantarray ? ($dbh, $proto, $prefix, $args) : $dbh;
        }
 elsif ($proto eq "postgresql") {
@@ -9199,7 +9198,6 @@ elsif ($proto eq "postgresql") {
        $cstr .= ";port=$port" if ($port);
        my $dbh = $drh->connect($cstr, $user, $pass);
        $dbh || return &text('sql_epostgresqlconnect', $drh->errstr);
-       $dbh->{'AutoCommit'} = 1;
        return wantarray ? ($dbh, $proto, $prefix, $args) : $dbh;
        }
 elsif ($proto eq "ldap") {