user_id changed to user

doc/serdev/serdev.sgml

@@ -5066,7 +5066,7 @@ int n = RES_ROW_N(res);
 			    Type: <type>string</type>
 			</para>
 			<para>
-			    Default: <quote>user_id</quote>
+			    Default: <quote>user</quote>
 			</para>
 		    </listitem>
 

etc/iptel.cfg

@@ -58,7 +58,7 @@ modparam("usrloc", "db_url","sql://ser:heslo@dbhost/ser")
 #modparam("auth", "calculate_ha1", yes)
 
 modparam("auth", "db_url","sql://ser:heslo@dbhost/ser")
-modparam("auth", "user_column",   "user_id")
+modparam("auth", "user_column",   "user")
 # nonce generation secret; particularly useful if multiple servers
 # in a proxy farm are configured to authenticate
 #modparam("auth", "secret", "43sjkl33T9kjj_5jvlA384hg")

etc/obsoleted/backup.cfg

@@ -55,7 +55,7 @@ modparam("usrloc", "db_url",         "sql://root:@localhost/ser")
 # -- auth params --
 
 modparam("auth", "db_url",        "sql://root:@localhost/ser")
-modparam("auth", "user_column",   "user_id")
+modparam("auth", "user_column",   "user")
 # nonce generation secret; particularly useful if multiple servers
 # in a proxy farm are configured to authenticate
 modparam("auth", "secret",        "439tg8h349g8hq349t9384hg")

etc/obsoleted/bat.cfg

@@ -46,7 +46,7 @@ modparam("usrloc", "db_url",         "sql://csps:47csps11@dbhost/csps107")
 
 modparam("auth", "db_url",         "sql://csps:47csps11@dbhost/csps107")
 modparam("auth", "table",         "subscriber")
-modparam("auth", "user_column",         "user_id")
+modparam("auth", "user_column",         "user")
 
 modparam("acc", "report_ack", 1)
 modparam("acc", "early_media", 1)

etc/obsoleted/secondary.cfg

@@ -46,7 +46,7 @@ modparam("usrloc", "db_url",         "sql://csps:47csps11@dbhost/csps107")
 
 modparam("auth", "db_url",         "sql://csps:47csps11@dbhost/csps107")
 modparam("auth", "table",         "subscriber")
-modparam("auth", "user_column",         "user_id")
+modparam("auth", "user_column",         "user")
 
 
 route{

etc/obsoleted/test.cfg

@@ -54,7 +54,7 @@ modparam("usrloc", "db_url",         "sql://csps:47csps11@dbhost/csps107")
 # -- auth params --
 
 modparam("auth", "db_url",        "sql://csps:47csps11@dbhost/csps107")
-modparam("auth", "user_column",   "user_id")
+modparam("auth", "user_column",   "user")
 # nonce generation secret; particularly useful if multiple servers
 # in a proxy farm are configured to authenticate
 modparam("auth", "secret",        "439tg8h349g8hq349t9384hg")

examples/exec_s3.cfg

@@ -13,7 +13,7 @@ loadmodule "modules/sl/sl.so"
 route[0] {
      if (!exec_msg('
 	QUERY="select email_address from subscriber 
-		where user_id=\"$SIP_OUSER\"";
+		where user=\"$SIP_OUSER\"";
 	EMAIL=`mysql  -Bsuser -pheslo -e "$QUERY" ser`;
 	if [ -z "$EMAIL" ] ; then exit 1; fi ;
 	echo "SIP request received from $SIP_HF_FROM for $SIP_OUSER" |

examples/exec_s4.cfg

@@ -23,7 +23,7 @@ route[0] {
 
      	if (!exec_msg('
 		QUERY="select email_address from subscriber 
-			where user_id=\"$SIP_OUSER\"";
+			where user=\"$SIP_OUSER\"";
 		EMAIL=`mysql  -Bsuser -pheslo -e "$QUERY" ser`;
 		if [ -z "$EMAIL" ] ; then exit 1; fi ;
 		echo "SIP request received from $SIP_HF_FROM for $SIP_OUSER" |

examples/exec_s5.cfg

@@ -49,7 +49,7 @@ route[1] {
 	# an email notification to him
      	if (!exec_msg('
 		QUERY="select email_address from subscriber 
-			where user_id=\"$SIP_OUSER\"";
+			where user=\"$SIP_OUSER\"";
 		EMAIL=`mysql  -Bsuser -pheslo -e "$QUERY" ser`;
 		if [ -z "$EMAIL" ] ; then exit 1; fi ;
 		echo "SIP request received from $SIP_HF_FROM for $SIP_OUSER" |

examples/exec_s5b.cfg

@@ -52,7 +52,7 @@ route[1] {
 	# an email notification to him
      	if (!exec_msg('
 		QUERY="select email_address from subscriber 
-			where user_id=\"$SIP_OUSER\"";
+			where user=\"$SIP_OUSER\"";
 		EMAIL=`mysql  -Bsuser -pheslo -e "$QUERY" ser`;
 		if [ -z "$EMAIL" ] ; then exit 1; fi ;
 		echo "SIP request received from $SIP_HF_FROM for $SIP_OUSER" |
@@ -71,7 +71,7 @@ reply_route[1] {
 	# just call exec, that's it
      	exec_msg('
 		QUERY="select email_address from subscriber 
-			where user_id=\"$SIP_OUSER\"";
+			where user=\"$SIP_OUSER\"";
 		EMAIL=`mysql  -Bsuser -pheslo -e "$QUERY" ser`;
 		if [ -z "$EMAIL" ] ; then exit 1; fi ;
 		echo "SIP request received from $SIP_HF_FROM for $SIP_OUSER" |