Browse code

user column changed to username

Jan Janak authored on 18/03/2003 17:48:19
Showing 7 changed files
... ...
@@ -76,7 +76,7 @@ int (*sl_reply)(struct sip_msg* _msg, char* _str1, char* _str2);
76 76
  * Module parameter variables
77 77
  */
78 78
 char* db_url           = "sql://serro:47serro11@localhost/ser";
79
-char* username_column  = "username";
79
+char* user_column      = "username";
80 80
 char* domain_column    = "domain";
81 81
 char* pass_column      = "ha1";
82 82
 char* pass_column_2    = "ha1b";
... ...
@@ -100,11 +100,11 @@ static cmd_export_t cmds[] = {
100 100
  */
101 101
 static param_export_t params[] = {
102 102
 	{"db_url", STR_PARAM, &db_url},
103
-	{"username_column",   STR_PARAM, &username_column},
104
-	{"domain_column",     STR_PARAM, &domain_column  },
105
-	{"password_column",   STR_PARAM, &pass_column    },
106
-	{"password_column_2", STR_PARAM, &pass_column_2  },
107
-	{"calculate_ha1",     INT_PARAM, &calc_ha1       },
103
+	{"user_column",       STR_PARAM, &user_column  },
104
+	{"domain_column",     STR_PARAM, &domain_column},
105
+	{"password_column",   STR_PARAM, &pass_column  },
106
+	{"password_column_2", STR_PARAM, &pass_column_2},
107
+	{"calculate_ha1",     INT_PARAM, &calc_ha1     },
108 108
 	{0, 0, 0}
109 109
 };
110 110
 
... ...
@@ -41,7 +41,7 @@
41 41
  */
42 42
 
43 43
 extern char* db_url;          /* Database URL */
44
-extern char* username_column; /* 'username' column name */
44
+extern char* user_column;     /* 'username' column name */
45 45
 extern char* domain_column;   /* 'domain' column name */
46 46
 extern char* pass_column;     /* 'password' column name */
47 47
 extern char* pass_column_2;   /* Column containg HA1 string constructed
... ...
@@ -54,7 +54,7 @@ static inline int get_ha1(str* _user, str* _domain, int use_ha1b, char* _table,
54 54
 	db_res_t* res;
55 55
 	str result;
56 56
 
57
-	keys[0] = username_column;
57
+	keys[0] = user_column;
58 58
 	keys[1] = domain_column;
59 59
 	col[0] = (use_ha1b && !calc_ha1) ? (pass_column_2) : (pass_column);	
60 60
 
... ...
@@ -74,7 +74,7 @@ static int hf_fixup(void** param, int param_no);
74 74
 char* db_url       = "sql://serro:47serro11@localhost/ser";
75 75
 
76 76
 char* table        = "grp";    /* Table name where group definitions are stored */
77
-char* user_col     = "user";
77
+char* user_col     = "username";
78 78
 char* domain_col   = "domain";
79 79
 char* grp_col      = "grp";
80 80
 int   use_domain   = 0;
... ...
@@ -61,7 +61,7 @@ char* uri_user_col          = "username";   /* Name of username column in URI ta
61 61
 char* uri_domain_col        = "domain";     /* Name of domain column in URI table */
62 62
 char* uri_uriuser_col       = "uri_user";   /* Name of uri_user column in URI table */
63 63
 char* subscriber_table      = "subscriber"; /* Name of subscriber table */
64
-char* subscriber_user_col   = "user";       /* Name of user column in subscriber table */
64
+char* subscriber_user_col   = "username";   /* Name of user column in subscriber table */
65 65
 char* subscriber_domain_col = "domain";     /* Name of domain column in subscriber table */
66 66
 
67 67
 int use_uri_table = 0;     /* Should uri table be used */
... ...
@@ -59,7 +59,7 @@ static int child_init(int rank);                    /* Per-child init function *
59 59
 /*
60 60
  * Module parameters and their default values
61 61
  */
62
-char* user_col       = "user";                             /* Name of column containing usernames */
62
+char* user_col       = "username";                         /* Name of column containing usernames */
63 63
 char* domain_col     = "domain";                           /* Name of column containing domains */
64 64
 char* contact_col    = "contact";                          /* Name of column containing contact addresses */
65 65
 char* expires_col    = "expires";                          /* Name of column containing expires values */
... ...
@@ -68,7 +68,7 @@ struct tm_binds _tmb;
68 68
 char* vm_db_url = "sql://ser:heslo@localhost/ser";    /* Database URL */
69 69
 char* email_column = "email_address";
70 70
 char* subscriber_table = "subscriber" ;
71
-char* user_column = "user_id";
71
+char* user_column = "username";
72 72
 #ifdef MULTI_DOMAIN
73 73
 char* domain_column = "domain";
74 74
 #endif