fmk Tue Apr 10 11:44:51 2001 EDT
Modified files:
/php4/ext/fbsql php_fbsql.c
Log:
Fixing database password to actually work
Index: php4/ext/fbsql/php_fbsql.c
diff -u php4/ext/fbsql/php_fbsql.c:1.9 php4/ext/fbsql/php_fbsql.c:1.10
--- php4/ext/fbsql/php_fbsql.c:1.9 Wed Apr 4 13:10:14 2001
+++ php4/ext/fbsql/php_fbsql.c Tue Apr 10 11:44:51 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.c,v 1.9 2001/04/04 20:10:14 fmk Exp $ */
+/* $Id: php_fbsql.c,v 1.10 2001/04/10 18:44:51 fmk Exp $ */
/* TODO:
*
@@ -408,10 +408,6 @@
name[sizeof(name)-1] = 0;
fbsql_globals->hostName = strdup(name);
}
-/* fbsql_globals->userName = strdup(fbsql_globals->userName); */
-/* fbsql_globals->userPassword = strdup(fbsql_globals->userPassword);
*/
-/* fbsql_globals->databaseName = strdup(fbsql_globals->databaseName);
*/
-/* fbsql_globals->databasePassword = strdup(fbsql_globals->databasePassword); */
fbsql_globals->persistantCount = 0;
fbsql_globals->linkCount = 0;
@@ -713,13 +709,9 @@
}
/* }}} */
-
-/* {{{ proto int fbsql_select_db(string database_name [, int link_identifier]
- */
PHPFBDatabase* phpfbSelectDB
( INTERNAL_FUNCTION_PARAMETERS,
char* databaseName,
- char* databasePassword,
PHPFBLink* link
)
{
@@ -750,7 +742,7 @@
else
{
list_entry le;
- FBCDatabaseConnection* c =
fbcdcConnectToDatabase(databaseName,link->hostName,databasePassword);
+ FBCDatabaseConnection* c =
+fbcdcConnectToDatabase(databaseName,link->hostName,FB_SQL_G(databasePassword));
FBCMetaData* md;
if (c == NULL)
{
@@ -800,7 +792,7 @@
result->index = zend_list_insert((PHPFBDatabase*)(le.ptr),
le_dba);
result->link = phpfbRetainLink(link);
result->databaseName = strdup(databaseName);
- result->databasePassword = strdup(databasePassword);
+ result->databasePassword = strdup(FB_SQL_G(databasePassword));
result->connection = c;
result->errorNo = 0;
result->errorText = NULL;
@@ -1010,7 +1002,7 @@
if (argc >= 1)
{
convert_to_string_ex(argv[0]);
- free(FB_SQL_G(hostName));
+ free(FB_SQL_G(databasePassword));
FB_SQL_G(databasePassword) = strdup((*argv[0])->value.str.val);
}
}
@@ -1098,7 +1090,7 @@
if (phpLink == NULL) RETURN_FALSE;
/* printf("Select db at link %s@%s\n",phpLink->hostName,phpLink->userName); */
- database = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,name,"",phpLink);
+ database = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,name,phpLink);
if (database == NULL) RETURN_FALSE;
phpLink->currentDatabase = database;
@@ -1147,7 +1139,7 @@
link = (*argv[3])->value.lval;
}
if ((phpLink = phpfbGetLink(link))==NULL) RETURN_FALSE;
- if ((phpDatabase =
phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,databaseName,"",phpLink)) == NULL)
RETURN_FALSE;
+ if ((phpDatabase =
+phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,databaseName,phpLink)) == NULL)
+RETURN_FALSE;
{
char buffer[1024];
sprintf(buffer,"SET AUTHORIZATION %s;",userName);
@@ -1348,7 +1340,7 @@
if (phpLink == NULL) RETURN_FALSE;
}
- phpDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,
databaseName,"",phpLink);
+ phpDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,
+databaseName,phpLink);
if (phpDatabase == NULL) RETURN_FALSE;
/* printf("Stop db %x\n",phpDatabase->connection); */
@@ -1698,7 +1690,7 @@
}
if (phpLink == NULL) RETURN_FALSE;
/* printf("Query db at link %s@%s\n",phpLink->hostName,phpLink->userName); */
- phpDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,
databaseName,"",phpLink);
+ phpDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,
+databaseName,phpLink);
if (phpDatabase == NULL) RETURN_FALSE;
phpResult = phpfbQuery(INTERNAL_FUNCTION_PARAM_PASSTHRU,sql,phpDatabase);
@@ -1818,11 +1810,11 @@
if (databaseName == NULL)
{
- phpLink->currentDatabase =
phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, FB_SQL_G(databaseName),"",phpLink);
+ phpLink->currentDatabase =
+phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, FB_SQL_G(databaseName),phpLink);
}
else
{
- phpLink->currentDatabase =
phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, databaseName,"",phpLink);
+ phpLink->currentDatabase =
+phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, databaseName,phpLink);
}
phpDatabase = phpLink->currentDatabase;
if (phpDatabase == NULL) RETURN_FALSE;
@@ -1882,7 +1874,7 @@
}
if (phpLink == NULL) RETURN_FALSE;
- phpDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,
databaseName,"",phpLink);
+ phpDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,
+databaseName,phpLink);
phpLink->currentDatabase = phpDatabase;
if (phpDatabase == NULL) RETURN_FALSE;
@@ -2038,7 +2030,7 @@
if (phpLink->currentDatabase == NULL)
{
- phpLink->currentDatabase =
phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, FB_SQL_G(databaseName),"",phpLink);
+ phpLink->currentDatabase =
+phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, FB_SQL_G(databaseName),phpLink);
}
phpDatabase = phpLink->currentDatabase;
if (phpDatabase == NULL) RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
