rpms/condor/devel const_strchr.patch, NONE, 1.1 condor.spec, 1.16, 1.17

Matthew Farrellee matt at fedoraproject.org
Tue Feb 24 19:36:31 UTC 2009


Author: matt

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25940

Modified Files:
	condor.spec 
Added Files:
	const_strchr.patch 
Log Message:
7.2.1-1

const_strchr.patch:

--- NEW FILE const_strchr.patch ---
diff --git a/src/condor_c++_util/store_cred.cpp b/src/condor_c++_util/store_cred.cpp
index 9d43fc8..49da998 100644
--- a/src/condor_c++_util/store_cred.cpp
+++ b/src/condor_c++_util/store_cred.cpp
@@ -170,7 +170,7 @@ char* getStoredCredential(const char *username, const char *domain)
 
 int store_cred_service(const char *user, const char *pw, int mode)
 {
-	char *at = strchr(user, '@');
+	const char *at = strchr(user, '@');
 	if ((at == NULL) || (at == user)) {
 		dprintf(D_ALWAYS, "store_cred: malformed user name\n");
 		return FAILURE;


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- condor.spec	24 Feb 2009 16:34:47 -0000	1.16
+++ condor.spec	24 Feb 2009 19:36:00 -0000	1.17
@@ -28,6 +28,7 @@
 Patch3: chkconfig_off.patch
 Patch4: no_rpmdb_query.patch
 Patch5: no_basename.patch
+Patch6: const_strchr.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -113,6 +114,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;




More information about the scm-commits mailing list