fix upstream bug 5115
This commit is contained in:
parent
5d0f1053c6
commit
e0eaec83dd
67
pegasus-2.5.1-obz5115.patch
Normal file
67
pegasus-2.5.1-obz5115.patch
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
--- pegasus/SetConfig_EnvVar.obz5115 2006-01-30 11:16:16.000000000 -0500
|
||||||
|
+++ pegasus/SetConfig_EnvVar 2006-06-07 15:06:18.000000000 -0400
|
||||||
|
@@ -1,34 +1,34 @@
|
||||||
|
#!/usr/bin/perl
|
||||||
|
-//%2006////////////////////////////////////////////////////////////////////////
|
||||||
|
-//
|
||||||
|
-// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
|
||||||
|
-// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
|
||||||
|
-// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
|
||||||
|
-// IBM Corp.; EMC Corporation, The Open Group.
|
||||||
|
-// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
|
||||||
|
-// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
|
||||||
|
-// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
|
||||||
|
-// EMC Corporation; VERITAS Software Corporation; The Open Group.
|
||||||
|
-// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
|
||||||
|
-// EMC Corporation; Symantec Corporation; The Open Group.
|
||||||
|
-//
|
||||||
|
-// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
-// of this software and associated documentation files (the "Software"), to
|
||||||
|
-// deal in the Software without restriction, including without limitation the
|
||||||
|
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||||
|
-// sell copies of the Software, and to permit persons to whom the Software is
|
||||||
|
-// furnished to do so, subject to the following conditions:
|
||||||
|
-//
|
||||||
|
-// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
|
||||||
|
-// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
|
||||||
|
-// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
|
||||||
|
-// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
|
||||||
|
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||||
|
-// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
-//
|
||||||
|
-//================================================================================
|
||||||
|
+#//%2006////////////////////////////////////////////////////////////////////////
|
||||||
|
+#//
|
||||||
|
+#// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
|
||||||
|
+#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
|
||||||
|
+#// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
|
||||||
|
+#// IBM Corp.; EMC Corporation, The Open Group.
|
||||||
|
+#// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
|
||||||
|
+#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
|
||||||
|
+#// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
|
||||||
|
+#// EMC Corporation; VERITAS Software Corporation; The Open Group.
|
||||||
|
+#// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
|
||||||
|
+#// EMC Corporation; Symantec Corporation; The Open Group.
|
||||||
|
+#//
|
||||||
|
+#// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
+#// of this software and associated documentation files (the "Software"), to
|
||||||
|
+#// deal in the Software without restriction, including without limitation the
|
||||||
|
+#// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||||
|
+#// sell copies of the Software, and to permit persons to whom the Software is
|
||||||
|
+#// furnished to do so, subject to the following conditions:
|
||||||
|
+#//
|
||||||
|
+#// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
|
||||||
|
+#// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
|
||||||
|
+#// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
|
||||||
|
+#// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
|
||||||
|
+#// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
+#// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||||
|
+#// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
+#// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
+#//
|
||||||
|
+#//================================================================================
|
||||||
|
use strict;
|
||||||
|
#use warnings;
|
||||||
|
my $HELP_FILE = "SetConfig_EnvVar.help";
|
29
pegasus-2.5.1-obz5119.patch
Normal file
29
pegasus-2.5.1-obz5119.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
--- pegasus/src/Pegasus/Provider/CMPI/CmpiImpl.cpp.obz5119 2006-01-30 11:18:00.000000000 -0500
|
||||||
|
+++ pegasus/src/Pegasus/Provider/CMPI/CmpiImpl.cpp 2006-06-07 15:13:01.000000000 -0400
|
||||||
|
@@ -1197,7 +1197,7 @@
|
||||||
|
else
|
||||||
|
throw CmpiStatus(rc.rc,name->charPtr());
|
||||||
|
}
|
||||||
|
- if (name) *name=*(new CmpiString(s));
|
||||||
|
+ if (name) *name= CmpiString(s);
|
||||||
|
return d;
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -1386,7 +1386,7 @@
|
||||||
|
CMPIString *s;
|
||||||
|
d._data=getEnc()->ft->getKeyAt(getEnc(),(int)pos,&s,&rc);
|
||||||
|
if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
|
||||||
|
- if (name) *name=*(new CmpiString(s));
|
||||||
|
+ if (name) *name= CmpiString(s);
|
||||||
|
return d;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1710,7 +1710,7 @@
|
||||||
|
else
|
||||||
|
throw CmpiStatus(rc.rc,name->charPtr());
|
||||||
|
}
|
||||||
|
- if (name) *name=*(new CmpiString(s));
|
||||||
|
+ if (name) *name= CmpiString(s);
|
||||||
|
return d;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user