michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-08-12 18:40:43 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix assumption about orders if columns in pg_shadow

Browse Source
This commit is contained in:
Jamie Cameron
2011-12-11 15:21:41 -08:00
parent 21742599d6
commit 4314eec433
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
postgresql/edit_group.cgi
View File

@@ -39,7 +39,7 @@ else {
}
# Group members
$s = &execute_sql($config{'basedb'}, "select * from pg_shadow");
$s = &execute_sql($config{'basedb'}, "select $pg_shadow_cols from pg_shadow");
%uidtouser = map { $_->[1], $_->[0] } @{$s->{'data'}};
if (!$in{'new'}) {
@mems = map { [ $_, $uidtouser{$_} || $_ ] } &split_array($group[2]);

5
postgresql/edit_user.cgi
View File

@@ -10,8 +10,9 @@ if ($in{'new'}) {
}
else {
&ui_print_header(undef, $text{'user_edit'}, "");
$s = &execute_sql_safe($config{'basedb'}, "select * from pg_shadow ".
"where usename = '$in{'user'}'");
$s = &execute_sql_safe($config{'basedb'},
"select $pg_shadow_cols from pg_shadow ".
"where usename = '$in{'user'}'");
@user = @{$s->{'data'}->[0]};
}

2
postgresql/list_users.cgi
View File

@@ -6,7 +6,7 @@ require './postgresql-lib.pl';
$access{'users'} || &error($text{'user_ecannot'});
&ui_print_header(undef, $text{'user_title'}, "", "list_users");
$s = &execute_sql_safe($config{'basedb'}, "select * from pg_shadow");
$s = &execute_sql_safe($config{'basedb'}, "select $pg_shadow_cols from pg_shadow");
print &ui_form_start("delete_users.cgi", "post");
@rowlinks = ( &select_all_link("d", 0),
&select_invert_link("d", 0),

1
postgresql/postgresql-lib.pl
View File

@@ -13,6 +13,7 @@ if ($config{'psql'} =~ /^(.*)\/bin\/psql$/ && $1 ne '' && $1 ne '/usr') {
$ENV{$gconfig{'ld_env'}} .= ':' if ($ENV{$gconfig{'ld_env'}});
$ENV{$gconfig{'ld_env'}} .= "$1/lib";
}
$pg_shadow_cols = "usename,usesysid,usecreatedb,usesuper,usecatupd,passwd,valuntil";
if ($module_info{'usermin'}) {
# Login and password is set by user in Usermin, and the module always

2
postgresql/save_group.cgi
View File

@@ -32,7 +32,7 @@ else {
# Actually create or update the group
if (&get_postgresql_version() >= 8.0) {
# Need to use new create group or modify command
$s = &execute_sql($config{'basedb'}, "select * from pg_shadow");
$s = &execute_sql($config{'basedb'}, "select $pg_shadow_cols from pg_shadow");
foreach $u (@{$s->{'data'}}) {
$umap{$u->[1]} = $u->[0];
}

4
postgresql/useradmin_update.pl
View File

@@ -24,7 +24,7 @@ sub useradmin_delete_user
{
if ($config{'sync_delete'}) {
local $s = &execute_sql($config{'basedb'},
"select * from pg_shadow where usename = '$_[0]->{'user'}'");
"select $pg_shadow_cols from pg_shadow where usename = '$_[0]->{'user'}'");
return if (!@{$s->{'data'}});
&execute_sql_logged($config{'basedb'}, "drop user \"$_[0]->{'user'}\"");
}
@@ -36,7 +36,7 @@ sub useradmin_modify_user
{
if ($config{'sync_modify'}) {
local $s = &execute_sql($config{'basedb'},
"select * from pg_shadow where usename = '$_[0]->{'olduser'}'");
"select $pg_shadow_cols from pg_shadow where usename = '$_[0]->{'olduser'}'");
return if (!@{$s->{'data'}});
local $version = &get_postgresql_version();
if ($_[0]->{'user'} ne $_[0]->{'olduser'}) {