Projects/mysql-admutils
13
0
Fork 0
Code Issues Pull Requests Activity

Version 0.51

Browse Source 
Mer brukervennlige feilmeldinger, samt fikset alle kompilatoradvarsler.
This commit is contained in:
Geir Hauge
2007-02-27 14:10:08 +00:00
parent bcb560b925
commit 21f0f57f99
7 changed files with 578 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
mysql-useradm.c
View File

@@ -1,5 +1,5 @@
/*
* @(#) $Header: /tmp/cvs/mysql-admutils/mysql-useradm.c,v 1.10 2005-06-27 10:13:01 knuta Exp $
* @(#) $Header: /tmp/cvs/mysql-admutils/mysql-useradm.c,v 1.11 2007-02-27 14:10:08 geirha Exp $
*
* mysql-useradm.c
*
@@ -52,7 +52,7 @@ is_password_set(MYSQL *pmysql, const char *user)
return -1;
if (rows > 1)
return dberror(NULL, "Query for password for user '%s' gave %d results!",
user, rows);
user, rows);
row = mysql_fetch_row(res);
return (row[0] && (strlen(row[0]) > 0));
}
@@ -99,25 +99,25 @@ passwd(MYSQL *pmysql, const char *user)
sprintf(prompt, "(current) MySQL password for user '%s': ", user);
password = getpass(prompt);
sprintf(query, "select password = password('%s') from user "
"where user = '%s'", password, user);
"where user = '%s'", password, user);
if (mysql_query(pmysql, query))
return dberror(pmysql, "Failed to check old password for user '%s'.",
user);
return dberror(pmysql, "Failed to check old password for user '%s'.",
user);
res = mysql_store_result(pmysql);
rows = mysql_num_rows(res);
if (rows == 0)
return dberror(NULL, "Check for old password for user '%s' "
"returned empty.", user);
return dberror(NULL, "Check for old password for user '%s' "
"returned empty.", user);
if (rows > 1)
return dberror(NULL, "Check for old password for user '%s' "
"returned more than one row!", user);
return dberror(NULL, "Check for old password for user '%s' "
"returned more than one row!", user);
row = mysql_fetch_row(res);
if (strcmp(row[0], "1") != 0)
{
fprintf(stderr, "%s: Wrong password entered for user '%s'.\n",
program_name, user);
return 1;
}
{
fprintf(stderr, "%s: Wrong password entered for user '%s'.\n",
program_name, user);
return 1;
}
}
sprintf(prompt, "New MySQL password for user '%s': ", user);
@@ -133,12 +133,12 @@ passwd(MYSQL *pmysql, const char *user)
free(confirm_password);
sprintf(query, "update user set password = password('%s') "
"where user = '%s'", password, user);
"where user = '%s'", password, user);
if (mysql_query(pmysql, query))
return dberror(pmysql, "Failed to set new password for user '%s'.", user);
if (mysql_affected_rows(pmysql) > 1)
dberror(NULL, "%d rows affected by password update for user '%s'!",
mysql_affected_rows(pmysql), user);
mysql_affected_rows(pmysql), user);
fprintf(stderr, "Password updated for user '%s'.\n", user);
return 0;
@@ -180,7 +180,7 @@ list(MYSQL *pmysql)
p = getpwuid(getuid());
sprintf(query, "select user from user where user='%s' or user like '%s\\_%%'",
p->pw_name, p->pw_name);
p->pw_name, p->pw_name);
// sprintf(query, "select user from user where user='myhr' or user like 'myhr\\_%%'");
numgroups = 0;
@@ -212,7 +212,7 @@ list(MYSQL *pmysql)
for (i = 0; i < rows; i++)
if ((row = mysql_fetch_row(res)))
{
userlist[i] = strdup(row[0]);
userlist[i] = strdup(row[0]);
}
userlist[i] = NULL;
@@ -270,7 +270,7 @@ main(int argc, char *argv[])
/* connect to the database server and select the mysql database */
if (!mysql_real_connect(&mysql, db_server, db_user, db_passwd, db_name, 0, NULL, 0))
return dberror(&mysql, "Cannot connect to database server '%s'.",
db_server);
db_server);
if (mysql_select_db(&mysql, db_name))
return dberror(&mysql, "Cannot select database '%s'.", db_name);
@@ -279,11 +279,11 @@ main(int argc, char *argv[])
dblist = list(&mysql);
p = dblist;
while (*p)
{
show(&mysql, *p);
free(*p);
p++;
}
{
show(&mysql, *p);
free(*p);
p++;
}
free(dblist);
}
else {
@@ -293,31 +293,40 @@ main(int argc, char *argv[])
for (i = 2; i < argc; i++) {
strncpy(user, argv[i], 32);
user[33] = '\0';
if (! (owner(user) || member(user)))
{
dberror(NULL, "You are not the owner of '%s'. Skipping.", user);
continue;
}
if (! (owner(user) || member(user)))
{
if (command == c_create)
dberror(NULL,"Unable to create mysql-user '%s'.\n"
switch (command)
{
case c_create:
create(&mysql, user);
break;
case c_delete:
delete(&mysql, user);
break;
case c_passwd:
passwd(&mysql, user);
break;
case c_show:
show(&mysql, user);
break;
default:
fprintf(stderr, "This point should never be reached.\n");
exit(1);
}
}
"A mysql-user must start with either '%s_' or "
"'groupname_', where groupname is a unix group you are a "
"member of. Type \"groups\" to see which groups you are "
"a member of.\n",
user, getpwuid(getuid())->pw_name);
else
dberror(NULL, "You are not in charge of mysql-user: '%s'. Skipping.", user);
continue;
}
switch (command)
{
case c_create:
create(&mysql, user);
break;
case c_delete:
delete(&mysql, user);
break;
case c_passwd:
passwd(&mysql, user);
break;
case c_show:
show(&mysql, user);
break;
default:
fprintf(stderr, "This point should never be reached.\n");
exit(1);
}
}
}
reload(&mysql);