Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24345/src/mal
Modified Files:
mal_authorize.mx
Log Message:
propagated changes of Monday Oct 15 2007 - Wednesday Oct 17 2007
from the MonetDB_5-2 branch to the development trunk
Index: mal_authorize.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_authorize.mx,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- mal_authorize.mx 4 Oct 2007 10:37:05 -0000 1.51
+++ mal_authorize.mx 17 Oct 2007 12:04:39 -0000 1.52
@@ -348,9 +348,10 @@
BATiter bi = bat_iterator(b);
if (*scenario == NULL || strNil(*scenario)) {
+ BBPunfix(b->batCacheid);
/* of course we DO NOT tell the exact reason here again
*/
- throw(INVCRED, "checkCredentials", "Invalid credentials
for user '%s'",
- *username);
+ throw(INVCRED, "checkCredentials",
+ "Invalid credentials for user '%s'",
*username);
}
/* ok, there are some tuples that we have to consider */
@@ -360,15 +361,19 @@
if (strcmp(*scenario, tmp) == 0) {
/* YAY! fun! party! We are granted access! */
*uid = *id;
+ BBPunfix(b->batCacheid);
return(MAL_SUCCEED);
}
}
+ BBPunfix(b->batCacheid);
/* uh oh... that we made it till here means it's wrong */
throw(INVCRED, "checkCredentials", "Invalid credentials for
user '%s'",
*username);
} else {
/* no scenario restriction applies, so everything is good */
+ if (b)
+ BBPunfix(b->batCacheid);
*uid = *id;
return(MAL_SUCCEED);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
