[Firebird-checkins] SF.net SVN: firebird:[51342] firebird/trunk

[<asf...@us...>]

Revision: 51342
          http://firebird.svn.sourceforge.net/firebird/?rev=51342&view=rev
Author:   asfernandes
Date:     2010-07-15 00:47:24 +0000 (Thu, 15 Jul 2010)

Log Message:
-----------
Misc

Modified Paths:
--------------
    firebird/trunk/builds/posix/Makefile.in.firebird
    firebird/trunk/src/jrd/UserManagement.cpp
    firebird/trunk/src/jrd/svc.cpp
    firebird/trunk/src/utilities/gsec/gsec.cpp
    firebird/trunk/src/utilities/gsec/secur_proto.h
    firebird/trunk/src/utilities/gsec/security.epp

Modified: firebird/trunk/builds/posix/Makefile.in.firebird
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.firebird	2010-07-14 10:29:09 UTC (rev 51341)
+++ firebird/trunk/builds/posix/Makefile.in.firebird	2010-07-15 00:47:24 UTC (rev 51342)
@@ -76,7 +76,7 @@
 #    use the static files as a last resort.
 #
 #  The bootstrap version of gpre (gpre_boot) is used to build all the
-#    engine file.  
+#    engine file.
 #    During this phase of the build process the limited version of alt.bin
 #    is used.  The full version of alt.bin is compiled later in the build
 #    process after the security database is available.  After the

Modified: firebird/trunk/src/jrd/UserManagement.cpp
===================================================================
--- firebird/trunk/src/jrd/UserManagement.cpp	2010-07-14 10:29:09 UTC (rev 51341)
+++ firebird/trunk/src/jrd/UserManagement.cpp	2010-07-15 00:47:24 UTC (rev 51342)
@@ -196,33 +196,53 @@
 	int attachment_charset = ttype_none;
 
 	if (u->user_name_entered)
+	{
 		putField(threadDbb, record,
 				 DumpField(f_sec_user_name, VALUE_STRING, strlen(u->user_name), u->user_name),
 				 attachment_charset);
+	}
+
 	if (u->group_name_entered)
+	{
 		putField(threadDbb, record,
 				 DumpField(f_sec_group_name, VALUE_STRING, strlen(u->group_name), u->group_name),
 				 attachment_charset);
+	}
+
 	if (u->uid_entered)
+	{
 		putField(threadDbb, record,
 				 DumpField(f_sec_uid, VALUE_INTEGER, sizeof(int), &u->uid),
 				 attachment_charset);
+	}
+
 	if (u->gid_entered)
+	{
 		putField(threadDbb, record,
 				 DumpField(f_sec_gid, VALUE_INTEGER, sizeof(int), &u->gid),
 				 attachment_charset);
+	}
+
 	if (u->first_name_entered)
+	{
 		putField(threadDbb, record,
 				 DumpField(f_sec_first_name, VALUE_STRING, strlen(u->first_name), u->first_name),
 				 attachment_charset);
+	}
+
 	if (u->middle_name_entered)
+	{
 		putField(threadDbb, record,
 				 DumpField(f_sec_middle_name, VALUE_STRING, strlen(u->middle_name), u->middle_name),
 				 attachment_charset);
+	}
+
 	if (u->last_name_entered)
+	{
 		putField(threadDbb, record,
 				 DumpField(f_sec_last_name, VALUE_STRING, strlen(u->last_name), u->last_name),
 				 attachment_charset);
+	}
 
 	buffer->store(record);
 }

Modified: firebird/trunk/src/jrd/svc.cpp
===================================================================
--- firebird/trunk/src/jrd/svc.cpp	2010-07-14 10:29:09 UTC (rev 51341)
+++ firebird/trunk/src/jrd/svc.cpp	2010-07-15 00:47:24 UTC (rev 51342)
@@ -1925,7 +1925,8 @@
 	// Only need to add username and password information to those calls which need
 	// to make a database connection
 
-	const bool flNeedUser = (svc_id == isc_action_svc_backup ||
+	const bool flNeedUser =
+		svc_id == isc_action_svc_backup ||
 		svc_id == isc_action_svc_restore ||
 		svc_id == isc_action_svc_nbak ||
 		svc_id == isc_action_svc_nrest ||
@@ -1936,15 +1937,16 @@
 		svc_id == isc_action_svc_trace_stop ||
 		svc_id == isc_action_svc_trace_suspend ||
 		svc_id == isc_action_svc_trace_resume ||
-		svc_id == isc_action_svc_trace_list);
+		svc_id == isc_action_svc_trace_list;
 
-	const bool flGsecUser = (svc_id == isc_action_svc_add_user ||
+	const bool flGsecUser =
+		svc_id == isc_action_svc_add_user ||
 		svc_id == isc_action_svc_delete_user ||
 		svc_id == isc_action_svc_modify_user ||
 		svc_id == isc_action_svc_display_user ||
 		svc_id == isc_action_svc_display_user_adm ||
 		svc_id == isc_action_svc_set_mapping ||
-		svc_id == isc_action_svc_drop_mapping);
+		svc_id == isc_action_svc_drop_mapping;
 
 	if (flNeedUser || flGsecUser)
 	{
@@ -1975,7 +1977,6 @@
 		}
 	}
 
-
 	// All services except for get_ib_log require switches
 	spb.rewind();
 	if ((!svc_switches.hasData()) && svc_id != isc_action_svc_get_fb_log)

Modified: firebird/trunk/src/utilities/gsec/gsec.cpp
===================================================================
--- firebird/trunk/src/utilities/gsec/gsec.cpp	2010-07-14 10:29:09 UTC (rev 51341)
+++ firebird/trunk/src/utilities/gsec/gsec.cpp	2010-07-15 00:47:24 UTC (rev 51342)
@@ -278,7 +278,7 @@
 				uSvc->started();
 			if (! useServices)
 			{
-				ret = SECURITY_exec_line(status, tdsec->tsec_real_user, 
+				ret = SECURITY_exec_line(status, tdsec->tsec_real_user,
 										 db_handle, user_data, data_print, NULL);
 				if (ret)
 				{

Modified: firebird/trunk/src/utilities/gsec/secur_proto.h
===================================================================
--- firebird/trunk/src/utilities/gsec/secur_proto.h	2010-07-14 10:29:09 UTC (rev 51341)
+++ firebird/trunk/src/utilities/gsec/secur_proto.h	2010-07-15 00:47:24 UTC (rev 51342)
@@ -33,4 +33,3 @@
 							void* callback_arg);
 
 #endif // UTILITIES_SECUR_PROTO_H
-

Modified: firebird/trunk/src/utilities/gsec/security.epp
===================================================================
--- firebird/trunk/src/utilities/gsec/security.epp	2010-07-14 10:29:09 UTC (rev 51341)
+++ firebird/trunk/src/utilities/gsec/security.epp	2010-07-15 00:47:24 UTC (rev 51342)
@@ -85,7 +85,7 @@
 }
 
 
-static bool storePasswd(ISC_STATUS* isc_status, FB_API_HANDLE DB, FB_API_HANDLE trans, 
+static bool storePasswd(ISC_STATUS* isc_status, FB_API_HANDLE DB, FB_API_HANDLE trans,
 						ISC_QUAD& blobId, const Firebird::string& passwd)
 {
 	UserBlob blob(isc_status);
@@ -98,6 +98,7 @@
 
 	if (!blob.putData(passwd.length(), passwd.c_str()))
 	{
+		blob.close();
 		return false;
 	}
 
@@ -105,7 +106,7 @@
 }
 
 SSHORT SECURITY_exec_line(ISC_STATUS* isc_status,
-						  const char *realUser,
+						  const char* realUser,
 						  FB_API_HANDLE DB,
 						  FB_API_HANDLE trans,
 						  internal_user_data* io_user_data,
@@ -544,7 +545,7 @@
 }
 
 SSHORT SECURITY_exec_line(ISC_STATUS* isc_status,
-						  const char *realUser,
+						  const char* realUser,
 						  FB_API_HANDLE DB,
 						  internal_user_data* io_user_data,
 						  FPTR_SECURITY_CALLBACK display_func,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.