Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32043/src/mal
Modified Files:
mal_authorize.mx
Log Message:
propagated changes of Friday 15 Feb 2008 - Monday Feb 18 2008
from the MonetDB_5-4 branch to the development trunk
Index: mal_authorize.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_authorize.mx,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- mal_authorize.mx 8 Feb 2008 22:36:31 -0000 1.57
+++ mal_authorize.mx 18 Feb 2008 15:37:42 -0000 1.58
@@ -516,6 +516,7 @@
BUN p, q;
str tmp;
BATiter useri;
+ oid id;
rethrow("addUser", tmp, AUTHrequireAdminOrUser(olduser));
@@ -536,7 +537,8 @@
/* ok, just do it! (with force, because sql makes view over it) */
useri = bat_iterator(user);
- BUNinplace(BATmirror(user), p, *newuser, BUNhead(useri, p), TRUE);
+ id = *(oid*)BUNhead(useri, p);
+ BUNinplace(user, p, &id, *newuser, TRUE);
AUTHcommit();
return(MAL_SUCCEED);
@@ -577,7 +579,7 @@
/* cypher the password */
rethrow("setPassword", tmp, AUTHcypherValue(&hash, passwd));
/* ok, just overwrite the password field for this user */
- BUNinplace(pass, p, BUNhead(passi, p), hash, FALSE);
+ BUNinplace(pass, p, &id, hash, FALSE);
GDKfree(hash);
AUTHcommit();
@@ -596,7 +598,7 @@
str tmp;
str hash;
oid id;
- BATiter useri, passi;
+ BATiter useri;
rethrow("setPassword", tmp, AUTHrequireAdmin());
@@ -627,8 +629,7 @@
/* ok, just overwrite the password field for this user */
p = BUNfnd(pass, &id);
assert (p != BUN_NONE);
- passi = bat_iterator(pass);
- BUNinplace(pass, p, BUNhead(passi, p), hash, FALSE);
+ BUNinplace(pass, p, &id, hash, FALSE);
GDKfree(hash);
AUTHcommit();
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
