Changeset: 7e7ecea3db9d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7e7ecea3db9d
Modified Files:
sql/server/rel_schema.c
sql/server/sql_semantic.c
sql/server/sql_semantic.h
Branch: remote_auth
Log Message:
Move function from sql_semantic.c into rel_schema.c
diffs (108 lines):
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -2254,6 +2254,39 @@ rel_comment_on(sql_allocator *sa, sqlid
return rel;
}
+static char *
+credentials_username(dlist *credentials)
+{
+ if (credentials == NULL) {
+ return NULL;
+ }
+ assert(credentials->h);
+
+ if (credentials->h->data.sval != NULL) {
+ return credentials->h->data.sval;
+ }
+
+ // No username specified.
+ return NULL;
+}
+
+static char *
+credentials_password(dlist *credentials)
+{
+ if (credentials == NULL) {
+ return NULL;
+ }
+ assert(credentials->h);
+
+ char *password = credentials->h->next->next->data.sval;;
+ if (password != NULL && credentials->h->next->data.i_val ==
SQL_PW_UNENCRYPTED) {
+ password = mcrypt_BackendSum(password, strlen(password));
+ }
+
+ return password;
+}
+
+
sql_rel *
rel_schemas(mvc *sql, symbol *s)
{
@@ -2298,7 +2331,7 @@ rel_schemas(mvc *sql, symbol *s)
username = stack_get_string(sql, "current_user");
}
if (password == NULL) {
- // No username specified, get the current user's
password from the vault.
+ // No password specified, get the current user's
password from the vault.
// TODO
password = NULL;
}
diff --git a/sql/server/sql_semantic.c b/sql/server/sql_semantic.c
--- a/sql/server/sql_semantic.c
+++ b/sql/server/sql_semantic.c
@@ -194,40 +194,6 @@ qname_catalog(dlist *qname)
return NULL;
}
-char *
-credentials_username(dlist *credentials)
-{
- if (credentials == NULL) {
- return NULL;
- }
- assert(credentials->h);
-
- if (credentials->h->data.sval != NULL) {
- return credentials->h->data.sval;
- }
-
- // No username specified.
- return NULL;
-}
-
-char *
-credentials_password(dlist *credentials) {
- if (credentials == NULL) {
- return NULL;
- }
- assert(credentials->h);
-
- if (credentials->h->next->data.i_val == SQL_PW_ENCRYPTED) {
- return credentials->h->next->next->data.sval;
- }
- else if (credentials->h->next->next->data.sval != NULL) {
- // We have an unencrypted password. Encrypt and return
- // TODO
- return NULL;
- }
-
- return NULL;
-}
int
set_type_param(mvc *sql, sql_subtype *type, int nr)
diff --git a/sql/server/sql_semantic.h b/sql/server/sql_semantic.h
--- a/sql/server/sql_semantic.h
+++ b/sql/server/sql_semantic.h
@@ -24,8 +24,6 @@ extern sql_schema *tmp_schema(mvc *sql);
extern char *qname_schema(dlist *qname);
extern char *qname_table(dlist *qname);
extern char *qname_catalog(dlist *qname);
-extern char *credentials_username(dlist *credentials);
-extern char *credentials_password(dlist *credentials);
#define qname_module(qname) qname_schema(qname)
#define qname_fname(qname) qname_table(qname)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
