Check-in Number: 30047
Date: 2012-Jan-31 16:55:32 (local)
2012-Jan-31 22:55:32 (UTC)
User:Greg Thain
Branch:
Comment:
Merged [30033], [30034], [30035], [30038], [30039], [30042], [30043], [30044], [30045], Merge branch 'master' of /p/condor/repository/CONDOR_SRC
Tickets:
Inspections:
Check-ins:
[30033] Merged [30022], [30024], [30032], Merge branch 'V7_7_5-branch'
[30034] various warning fixes found by MSVC's analyze option. includes some conditional defines in condor_header_features that allow warnings to be suppressed in MSVC without causing new warning in GCC ===VersionHistory:None===
[30035] NMI windows build glue - enable MSVC_ANALYZE if it is available. ===VersionHistory:None===
[30038] Merged [29218], [29600], [29601], [29602], [29607], [29608], [29609], [29998], [30036], [30037], Merge branch 'V7_7_5-branch'
[30039] add empty version history manual section for 7.7.6
[30042] Merged [30041], Merge branch 'V7_7_5-branch'
[30043] Fix fd leak in gahp_server found by Coverity. Leak is triggered in the gass server code when a GET request arrives, opening the file succeeds, but the first read fails.
[30044] Fix use-after-free bug found by Coverity. CID 10401
[30045] Fix for bad dprintf format in aviary_query_server contrib
Files:
doc/.gitignore      17bcffff -> c3b8be16    
doc/admin-man/configure.tex      17bcffff -> c3b8be16    
doc/admin-man/group-tracking.tex      17bcffff -> c3b8be16    
doc/version-history/7-6.history.tex      17bcffff -> c3b8be16    
doc/version-history/7-7.history.tex      17bcffff -> c3b8be16    
nmi_tools/glue/build/remote_pre      17bcffff -> c3b8be16    
src/condor_contrib/aviary/src/JobServerJobLogConsumer.cpp      17bcffff -> c3b8be16    
src/condor_daemon_client/dc_schedd.cpp      17bcffff -> c3b8be16    
src/condor_gridmanager/globusjob.cpp      17bcffff -> c3b8be16    
src/condor_includes/condor_header_features.h      17bcffff -> c3b8be16    
src/condor_sysapi/free_fs_blocks.cpp      17bcffff -> c3b8be16    
src/condor_utils/classad_log.cpp      17bcffff -> c3b8be16    
src/condor_utils/condor_pidenvid.cpp      17bcffff -> c3b8be16    
src/condor_utils/generic_stats.h      17bcffff -> c3b8be16    
src/condor_utils/log.cpp      17bcffff -> c3b8be16    
src/condor_utils/my_popen.cpp      17bcffff -> c3b8be16    
src/condor_utils/param_info.in      17bcffff -> c3b8be16    
src/gt2_gahp/my_ez.cpp      17bcffff -> c3b8be16    
src/nordugrid_gahp/globus_ftp_client_attr.c      17bcffff -> c3b8be16    
diff --git a/doc/.gitignore b/doc/.gitignore
index 96d975464d063102560c2340ccb1cd8d1ead259b..9f9a72d6e6876292865132a57f38884f10a4d1a5 100644
a/​doc/​.​gitignoreb/​doc/​.​gitignore
16 ref-v7.​6.​4/​16 ref-v7.​6.​4/​
17 ref-v7.​6.​5/​17 ref-v7.​6.​5/​
18 ref-v7.​6.​6/​18 ref-v7.​6.​6/​
19 ref-v7.​6.​7/​
19 ref-v7.​7.​1/​20 ref-v7.​7.​1/​
20 ref-v7.​7.​2/​21 ref-v7.​7.​2/​
21 ref-v7.​7.​3/​22 ref-v7.​7.​3/​
22 ref-v7.​7.​4/​23 ref-v7.​7.​4/​
23 ref-v7.​7.​5/​24 ref-v7.​7.​5/​
25 ref-v7.​7.​6/​
24 ref.​dvi26 ref.​dvi
25 symbol.​tex27 symbol.​tex
26 timesfont.​tex28 timesfont.​tex
diff --git a/doc/admin-man/configure.tex b/doc/admin-man/configure.tex
index 563697aee272c1e8428a65ebc82035a49a791179..e3c0c637952d56f75ff8196e59fb01225a4196a5 100644
a/​doc/​admin-man/​configure.​texb/​doc/​admin-man/​configure.​tex
7184 ··​regarding·​privilege·​separation)​.​·​This·​means·​that·​the·​\Condor{procd}7184 ··​regarding·​privilege·​separation)​.​·​This·​means·​that·​the·​\Condor{procd}
7185 ··​does·​not·​include·​the·​normal·​Condor·​logging·​subsystem,​·​and·​thus·7185 ··​does·​not·​include·​the·​normal·​Condor·​logging·​subsystem,​·​and·​thus·
7186 ··​multiple·​debug·​levels·​are·​not·​supported.​7186 ··​multiple·​debug·​levels·​are·​not·​supported.​
7187 ··\MacroNI{PROCD\_LOG}·​defaults·to·\File{\$(LOG)​/​ProcLog}.​7187 ··There·is·no·​default·value·for·this·variable,​·
7188 ··​so·​if·​not·​defined,​·​there·​will·​be·​no·​log·​for·​the·​\Condor{procd}.​
7188 ··​Note·​that·​enabling·​\Dflag{PROCFAMILY}·​in·​the·​debug·​level·​for·​any7189 ··​Note·​that·​enabling·​\Dflag{PROCFAMILY}·​in·​the·​debug·​level·​for·​any
7189 ··​other·​daemon·​will·​cause·​it·​to·​log·​all·​interactions·​with·​the7190 ··​other·​daemon·​will·​cause·​it·​to·​log·​all·​interactions·​with·​the
7190 ··​\Condor{procd}.​7191 ··​\Condor{procd}.​
7241 ··​See·​section~\ref{sec:​GroupTracking}·​on·​page~\pageref{sec:​GroupTracking}·​for·7242 ··​See·​section~\ref{sec:​GroupTracking}·​on·​page~\pageref{sec:​GroupTracking}·​for·
7242 ··​a·​detailed·​description.​7243 ··​a·​detailed·​description.​
7243 7244
7245 \label{param:​BaseCgroup}
7246 \item[\Macro{BASE\_CG​ROUP}]
7247 ··​The·​path·​to·​the·​directory·​used·​as·​the·​virtual·​file·​system·​for·​the
7248 ··​implementation·​of·​Linux·​kernel·​cgroups.​
7249 ··​This·​variable·​has·​no·​default·​value,​
7250 ··​and·​if·​not·​defined,​·​cgroup·​tracking·​will·​not·​be·​used.​
7251 ··​See·​section~\ref{sec:​CGroupTracking}·​on·​page~\pageref{sec:​CGroupTracking}·​for·
7252 ··​a·​description·​of·​cgroup-based·​process·​tracking.​
7253
7244 \end{description}7254 \end{description}
7245 7255
7246 %%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%7256 %%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%
7301 ··​between·​checks·​for·​an·​updated·​X509·​proxy·​credential.​·​The·​default7311 ··​between·​checks·​for·​an·​updated·​X509·​proxy·​credential.​·​The·​default
7302 ··​is·​10·​minutes·​(600·​seconds)​.​7312 ··​is·​10·​minutes·​(600·​seconds)​.​
7303 7313
7314 \label{param:​GridmanagerProxyRefre​shTime}
7315 \item[\Macro{GRIDMANA​GER\_PROXY\_REFRESH\_​TIME}]
7316 ··​For·​GRAM·​jobs,​·​the·​\Condor{gridmanager}·​will·​not·​forward·​a·​refreshed
7317 ··​proxy·​until·​the·​lifetime·​left·​for·​the·​proxy·​on·​the·​remote·​machine
7318 ··​falls·​below·​this·​value.​
7319 ··​The·​value·​is·​in·​seconds·​and·​the·​default·​is·​21600·​(6·​hours)​.​
7320
7304 \label{param:​GridmanagerMinimumPro​xyTime}7321 \label{param:​GridmanagerMinimumPro​xyTime}
7305 \item[\Macro{GRIDMANA​GER\_MINIMUM\_PROXY\_​TIME}]7322 \item[\Macro{GRIDMANA​GER\_MINIMUM\_PROXY\_​TIME}]
7306 ··​The·​minimum·​number·​of7323 ··​The·​minimum·​number·​of
diff --git a/doc/admin-man/group-tracking.tex b/doc/admin-man/group-tracking.tex
index 92069a71e7fe291bd3b31695a5dc1463d44a5dde..be3ef1722122c67a5bc88fd0c4a3c7deb11d30eb 100644
a/​doc/​admin-man/​group-tracking.​texb/​doc/​admin-man/​group-tracking.​tex
61 a·​full·​restart·​of·​Condor.​61 a·​full·​restart·​of·​Condor.​
62 62
63 %%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%63 %%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%
64 \subsection{\label{se​c:​CGroupTracking}Cgroup​·Based·​Process·​Tracking}·64 \subsection{\label{se​c:​CGroupTracking}Cgroup​-Based·​Process·​Tracking}·
65 %%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%65 %%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%
66 \index{cgroup·​based·​process·​tracking}
66 67
67 A·​new·​feature·​in·​Linux·​kernels·​version·​2.​6.​24·​and·newer·allows·Condor·to68 A·​new·​feature·​in·​Linux·​kernels·​version·​2.​6.​24·​and·more·recent·kernels
69 allows·​Condor·​to
68 more·​accurately·​and·​safely·​manage·​jobs·​composed·​of·​sets·​of·​processes.​70 more·​accurately·​and·​safely·​manage·​jobs·​composed·​of·​sets·​of·​processes.​
69 This·​Linux·​feature·​is·​called·​Control·​Groups,​·​or·​cgroups·​for·​short,​·​and·71 This·​Linux·​feature·​is·​called·​Control·​Groups,​·​or·​cgroups·​for·​short,​·​and·
70 is·​available·​starting·​with·the·​RHEL·​6·and·​Debian·​6,​·​and·​related·​distributions.​··72 it·is·​available·​starting·​with·​RHEL·​6,​·​Debian·​6,​·​and·​related·​distributions.​··
71 Documentation·​about·​Linux·​kernel·​support·​for·​cgroups·​can·​be·​found·​in73 Documentation·​about·​Linux·​kernel·​support·​for·​cgroups·​can·​be·​found·​in
72 the·​Documentation·​directory·​in·​the·​kernel·​source·​code·​distribution.​·Another74 the·​Documentation·​directory·​in·​the·​kernel·​source·​code·​distribution.​
73 good·reference·is·\URL{http:​/​/​docs.​redhat.​com/​docs/​en-US/​Red\_Hat\_Enterprise\​_Linux/​6/​html/​Resource\_Management\​_Guide/​index.​html}75 Another·good·reference·is·
74 Even·if·cgroup·support·is·built·into·the·kernel,​·many·distributions·don't76 \URL{http:​/​/​docs.​redhat.​com/​docs/​en-US/​Red\_Hat\_Enterprise\​_Linux/​6/​html/​Resource\_Management\​_Guide/​index.​html}
75 install·the·​cgroup·tools·by·default.​··In·other·to·use·cgroups,​·the·tools77 Even·if·​cgroup·support·is·built·into·the·kernel,​·
76 must·be·installed·also.​··On·RPM·based·systems,​·these·can·​be·installed78 many·distributions·do·not·install·the·cgroup·tools·​by·default.​
77 with·the·​command79 In·order·to·use·​cgroups,​·
78 80 the·tools·must·be·installed.​··
79 yum·​install·libcgroup\\\*81 On·RPM-based·systems,​·these·can·be·​installed·with·the·command
80
81 Starting·​in·​Condor·​7.​7.​0,​·​the·​Condor·​starter·​can·​optionally·​use·​cgroups
82 to·​accurately·​track·​of·​all·​processes·​started·​by·​a·​job,​·​even·​when·
83 quickly-exiting·​parent·​processes·​spawn·​many·​child·​processes.​··​As·​with·
84 the·​gid·​based·​tracking·​above,​·​this·​is·​only·​implemented·​when·​a·​procd·​is·​running.​
85 The·​Condor·​team·​recommends·​enabling·​this·​feature·​on·​Linux·​platforms·​which·​support·​it.​
86 When·​cgroup·​tracking·​is·​enabled,​·​Condor·​is·​able·​to·​report·​a·​much·​more·​accurate
87 measurement·​of·​the·​physical·​memory·​used·​by·​a·​set·​of·​processes.​
88 82
89 Kernel·cgroups·are·named·in·a·virtual·filesystem·hierarchy.​·Condor·will·put·each83 \begin{verbatim}
90 running·job·on·the·execute·node·in·a·separate·cgroup,​·named·job\_clusterid\_proci​d.​84 yum·install·libcgroup\*
91 These·directories·will·be·under·a·base·directory·name·by·the·Condor·configuration·85 \end{verbatim}
92 parameter·​\Macro{BASE\_CGROUP}.​··​This·​parameter·​has·​no·​default,​·​if·​it·​is·​not·​set,​·​cgroup
93 tracking·​will·​not·​be·​used.​··​Unless·​you·​need·​to·​integrate·​Condor·​jobs·​with·​other
94 cgroup·​based·​tracking,​·​a·​good·​choice·​might·​be·​/​condor.​·
95 86
96 Condor·itself·will·not·mount·the·virtual·cgroup·filesystems.​··This·can·either·be87 Starting·with·Condor·version·7.​7.​0,​·
97 done·by·hand·at·each·system·reboot,​·by·the·​cgconfig·service,​·which·reads·a·file88 the·\Condor{starter}·daemon·​can·optionally·use·​cgroups
98 called·/​etc/​cgconfig.​conf,​·or·automatically·by·​the·systemd·service,​·on·systems89 to·accurately·​track·all·​the·processes·started·by·a·job,​·
99 which·use·​systemd·instead·​of·init.​90 even·when·quickly-exiting·parent·processes·spawn·many·child·processes.​
91 As·​with·​the·​GID-based·​tracking,​·
92 this·​is·​only·​implemented·​when·​a·​\Condor{procd}·​daemon·​is·​running.​
93 The·​Condor·​team·​recommends·​enabling·​this·​feature·​on·​Linux·​platforms·
94 that·​support·​it.​
95 When·​cgroup·​tracking·​is·​enabled,​·
96 Condor·​is·​able·​to·​report·​a·​much·​more·​accurate
97 measurement·​of·​the·​physical·​memory·​used·​by·​a·​set·​of·​processes.​
100 98
101 An·example·cgconfig.​conf·​follows:​99 Kernel·cgroups·are·named·in·a·virtual·​file·system·hierarchy.​·
100 Condor·​will·​put·​each
101 running·​job·​on·​the·​execute·​node·​in·​a·​separate·​cgroup,​·
102 named·​using·​the·​job's·​attributes·​by·​\Expr{job\_<ClusterId​>\_<ProcId>},​
103 where·​\Expr{<ClusterId>}·​is·​replaced·​by·
104 the·​job·​ClassAd·​attribute·​\Attr{ClusterId},​
105 and·​\Expr{<ProcId>}·​is·​replaced·​by·
106 the·​job·​ClassAd·​attribute·​\Attr{ProcId}.​
107 These·​directories·​will·​be·​under·​a·​base·​directory·​named·
108 by·​the·​Condor·​configuration·​variable·​\Macro{BASE\_CGROUP}.​··
109 This·​variable·​has·​no·​default·​value,​·​so·​if·​the·​variable·​is·​not·​set,​
110 cgroup·​tracking·​will·​not·​be·​used.​··
111 Unless·​there·​is·​a·​need·​for·​integration·​of·​Condor·​jobs·​with·​other
112 cgroup-based·​tracking,​·
113 a·​good·​choice·​for·​\MacroNI{BASE\_CGROUP​}·​location·​might·​be·​\File{/​condor}.​·
114
115 Condor·​itself·​will·​not·​mount·​the·​virtual·​cgroup·​file·​systems.​··
116 This·​can·​either·​be·​done·​by·​hand·​at·​each·​system·​reboot,​·
117 by·​the·​\Prog{cgconfig}·​service·
118 which·​reads·​a·​file·​called·​\File{/​etc/​cgconfig.​conf},​·
119 or·​automatically·​by·​the·​\Prog{systemd}·​service·
120 on·​systems·​which·​use·​\Prog{systemd}·​instead·​of·​\Prog{init}.​
121
122 Here·​is·​an·​example·​of·​the·​contents·​of·​file·​\File{cgconfig.​conf}:​
102 123
103 \begin{verbatim}124 \begin{verbatim}
104 mount·​{125 mount·​{
116 }137 }
117 \end{verbatim}138 \end{verbatim}
118 139
119 If·​the·​mount·​command·​shows·​that·​no·​cgroup·​filesystems·​are·​mounted,​·then·either·the140 If·​the·​mount·​command·​shows·​that·​no·​cgroup·​file·systems·​are·​mounted,​·
120 by·hand·method·or·​the·cgconfig·service·will·need·to·mount·​the·four·controllers·which141 then·either·​the·by·hand·method·or·​the·\Prog{cgconfig}·service·
121 Condor·​needs:​··cpuacct,​·memory,​·freezer·and·blkio.​··142 will·​need·to·mount·the·four·controllers·which·Condor·needs:​
122 143 cpuacct,​·memory,​·freezer·and·blkio.​··
123 Once·cgroup·based·tracking·is·configured,​·usage·should·be·invisible·to·the·user·and·administrator.​··The·ProcLog144
124 will·mention·that·it·is·using·this·method,​·but·no·user·visible·changes·should·occur,​145 Once·cgroup-based·tracking·​is·configured,​·
146 usage·​should·​be·​invisible·​to·​the·​user·​and·​administrator.​··
147 The·​\Condor{procd}·​log,​·​as·​defined·​by·​configuration·​variable
148 \MacroNI{PROCD\_LOG},​·
149 will·​mention·​that·​it·​is·​using·​this·​method,​·
150 but·​no·​user·​visible·​changes·​should·​occur,​
125 other·​than·​the·​impossibility·​of·​a·​quickly-forking·​process·​escaping·​from·​the151 other·​than·​the·​impossibility·​of·​a·​quickly-forking·​process·​escaping·​from·​the
126 control·​of·​the·starter,​·and·the·more·accurate·reporting·of·memory·usage.​152 control·​of·​the·\Condor{starter},​
153 and·​the·​more·​accurate·​reporting·​of·​memory·​usage.​
diff --git a/doc/version-history/7-6.history.tex b/doc/version-history/7-6.history.tex
index d6fbba7c5dfe36ec139465e311112461f322be1e..c4a7d08af750a819aa47c43100fe9a2365fd25a6 100644
a/​doc/​version-history/​7-6.​history.​texb/​doc/​version-history/​7-6.​history.​tex
49 49
50 \begin{itemize}50 \begin{itemize}
51 51
52 \item·None.​52 \item·Fixed·a·rare·bug·in·the·parallel·universe,​·where·if·a·claim·was·removed
53 as·​the·​shadow·​was·​starting·​up,​·​all·​ranks·​of·​the·​job·​would·​never·​completely·
54 start.​
55 \Ticket{2786}
56
57 \item·​Fixed·​a·​bug·​that·​caused·​disk·​capacity·​to·​be·​under-reported·​in·​Windows
58 for·​drives·​with·​1TB·​or·​more·​of·​free·​space.​
59 \Ticket{2798}
53 60
54 \end{itemize}61 \end{itemize}
55 62
diff --git a/doc/version-history/7-7.history.tex b/doc/version-history/7-7.history.tex
index 4127338040aa9211d6cd09c420181e289af85168..7653d2538625dd0a3cf0ab4aed6e4efe69ee52f7 100644
a/​doc/​version-history/​7-7.​history.​texb/​doc/​version-history/​7-7.​history.​tex
11 This·​is·​the·​development·​release·​series·​of·​Condor.​11 This·​is·​the·​development·​release·​series·​of·​Condor.​
12 The·​details·​of·​each·​version·​are·​described·​below.​12 The·​details·​of·​each·​version·​are·​described·​below.​
13 13
14 %%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%
15 \subsection*{\label{s​ec:​New-7-7-6}Version·​7.​7.​6}
16 %%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%
17
18 \noindent·​Release·​Notes:​
19
20 \begin{itemize}
21
22 \item·​Condor·​version·​7.​7.​6·​not·​yet·​released.​
23 %\item·​Condor·​version·​7.​7.​6·​released·​on·​Month·​Date,​·​2012.​
24
25 \end{itemize}
26
27
28 \noindent·​New·​Features:​
29
30 \begin{itemize}
31
32 \item·​None.​
33
34 \end{itemize}
35
36 \noindent·​Configuration·​Variable·​and·​ClassAd·​Attribute·​Additions·​and·​Changes:​
37
38 \begin{itemize}
39
40 \item·​None.​
41
42 \end{itemize}
43
44 \noindent·​Bugs·​Fixed:​
45
46 \begin{itemize}
47
48 \item·​None.​
49
50 \end{itemize}
51
52 \noindent·​Known·​Bugs:​
53
54 \begin{itemize}
55
56 \item·​None.​
57
58 \end{itemize}
59
60 \noindent·​Additions·​and·​Changes·​to·​the·​Manual:​
61
62 \begin{itemize}
63
64 \item·​None.​
65
66 \end{itemize}
14 67
15 %%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%68 %%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%%%%%%%%%%%%%%%​%%%%%%%
16 \subsection*{\label{s​ec:​New-7-7-5}Version·​7.​7.​5}69 \subsection*{\label{s​ec:​New-7-7-5}Version·​7.​7.​5}
222 \end{itemize}275 \end{itemize}
223 \Ticket{2782}276 \Ticket{2782}
224 277
278 \item·​The·​new·​configuration·​variable
279 \Macro{GRIDMANAGER\_P​ROXY\_REFRESH\_TIME}·​controls·​when·​the
280 \Condor{gridmanager}·​forwards·​a·​refreshed·​proxy·​to·​the·​remote·​GRAM·​server.​
281 The·​lifetime·​remaining·​on·​the·​proxy·​on·​the·​remote·​server·​(in·​seconds)​·​must
282 fall·​below·​this·​value·​before·​the·​\Condor{gridmanager}·​will·​forward·​a
283 refreshed·​proxy.​·
284 The·​default·​value·​is·​21600·​seconds·​(6·​hours)​.​
285 Previously,​·​this·​value·​was·​not·​configurable.​
286 \Ticket{2792}
287
225 \end{itemize}288 \end{itemize}
226 289
227 \noindent·​Bugs·​Fixed:​290 \noindent·​Bugs·​Fixed:​
302 365
303 \begin{itemize}366 \begin{itemize}
304 367
305 \item·None.​368 \item·Condor's·ability·to·use·cgroup-based·process·tracking,​
369 available·​since·​Condor·​version·​7.​7.​0,​
370 has·​now·​been·​documented·​in·​section~\ref{sec:​CGroupTracking}.​
371 \Ticket{1831}
372 \Ticket{2120}
306 373
307 \end{itemize}374 \end{itemize}
308 375
diff --git a/nmi_tools/glue/build/remote_pre b/nmi_tools/glue/build/remote_pre
index b391279c48ead791ddc50cff6e70f9e255535514..b2d8bbe5a421ca6d3f3e017f1a827be44cebf4b9 100755
a/​nmi_tools/​glue/​build/​remote_preb/​nmi_tools/​glue/​build/​remote_pre
102 ····​my·​$prefast·​=·​`cl·​-?`;​102 ····​my·​$prefast·​=·​`cl·​-?`;​
103 ····​if·​($prefast·​=~·​/​analyze/​)​·​{·​$prefast·​=·​1;​·​}·​else·​{·​$prefast·​=·​0;​·​}103 ····​if·​($prefast·​=~·​/​analyze/​)​·​{·​$prefast·​=·​1;​·​}·​else·​{·​$prefast·​=·​0;​·​}
104 ····​print·​"PREFAST·​=·​$prefast\n";​104 ····​print·​"PREFAST·​=·​$prefast\n";​
105 ····​$defines{analyze}·​=·​"-DANALYZE:​BOOL=$prefast";​105 ····​$defines{analyze}·​=·​"-DMSVC_ANALYZE:​BOOL=$prefast";​
106 }106 }
107 107
108 #####################​#####################​#####################​#######108 #####################​#####################​#####################​#######
diff --git a/src/condor_contrib/aviary/src/JobServerJobLogConsumer.cpp b/src/condor_contrib/aviary/src/JobServerJobLogConsumer.cpp
index c719a218128bc256fcb09028e2afbc5b1b65bf0d..ad7e5deba0b85904169e3c465b2c14f156db0b96 100644
a/​src/​condor_contrib/​aviary/​src/​JobServerJobLogConsum​er.​cppb/​src/​condor_contrib/​aviary/​src/​JobServerJobLogConsum​er.​cpp
135 135
136 ····​if·​(g_jobs.​end()​·​==·​g_element)​·​{136 ····​if·​(g_jobs.​end()​·​==·​g_element)​·​{
137 ········​dprintf(D_ALWAYS,​137 ········​dprintf(D_ALWAYS,​
138 ················​"error·​reading·%s:​·​no·​such·​job·​found·​for·​key·​'%s'\n",​138 ················​"error·​reading·job·queue·log:​·​no·​such·​job·​found·​for·​key·​'%s'\n",​
139 ················​_key)​;​139 ················​_key)​;​
140 ········​return·​false;​140 ········​return·​false;​
141 ····​}141 ····​}
diff --git a/src/condor_daemon_client/dc_schedd.cpp b/src/condor_daemon_client/dc_schedd.cpp
index a3b6de25616b6b2486befe776b08ce2cee22672b..f2df97f85a2d64fbf7608e6cc64d2a56b9419512 100644
a/​src/​condor_daemon_client/​dc_schedd.​cppb/​src/​condor_daemon_client/​dc_schedd.​cpp
1568 »   ​if(·​!·​str·​)​·​{1568 »   ​if(·​!·​str·​)​·​{
1569 »   ​»   ​return·​false;​1569 »   ​»   ​return·​false;​
1570 »   ​}1570 »   ​}
1571 »   ​buf[0]·​=·​0;​·​/​/​·​in·​case·​result·​is·​bogus.​.​
1571 1572
1572 »   ​result·​=·​getResult(·​job_id·​)​;​1573 »   ​result·​=·​getResult(·​job_id·​)​;​
1573 1574
diff --git a/src/condor_gridmanager/globusjob.cpp b/src/condor_gridmanager/globusjob.cpp
index de0db80ac8a03b680ca3d7f833ef674691468a6b..b3ca812cdb83f147b2764348511b1261e806eb25 100644
a/​src/​condor_gridmanager/​globusjob.​cppb/​src/​condor_gridmanager/​globusjob.​cpp
3540 »   ​»   ​return·​false;​3540 »   ​»   ​return·​false;​
3541 »   ​}3541 »   ​}
3542 »   ​if·​(·​jmProxyExpireTime·​<·​jobProxy->expiration_​time·​)​·​{3542 »   ​if·​(·​jmProxyExpireTime·​<·​jobProxy->expiration_​time·​)​·​{
3543 »   ​»   ​if·(·time(NULL)​·>=·jmProxyExpireTime·-·6*3600·)​·{3543 »   ​»   ​/​/​·Don't·forward·the·refreshed·proxy·if·the·remote·proxy·has·more
3544 »   ​»   ​/​/​·​than·​GRIDMANAGER_PROXY_REN​EW_LIMIT·​time·​left.​
3545 »   ​»   ​int·​renew_min·​=·​param_integer(·​"GRIDMANAGER_PROXY_RE​FRESH_TIME",​·​6*3600·​)​;​
3546 »   ​»   ​if·​(·​time(NULL)​·​>=·​jmProxyExpireTime·​-·​renew_min·​)​·​{
3544 »   ​»   ​»   ​return·​false;​3547 »   ​»   ​»   ​return·​false;​
3545 »   ​»   ​}·​else·​{3548 »   ​»   ​}·​else·​{
3546 »   ​»   ​»   ​daemonCore->Reset_Tim​er(·​evaluateStateTid,​3549 »   ​»   ​»   ​daemonCore->Reset_Tim​er(·​evaluateStateTid,​
3547 »   ​»   ​»   ​»   ​»   ​»   ​»   ​»   ​·​(·​jmProxyExpireTime·​-·6*3600·​)​·​-·​time(NULL)​·​)​;​3550 »   ​»   ​»   ​»   ​»   ​»   ​»   ​»   ​·​(·​jmProxyExpireTime·​-·renew_min·​)​·​-·​time(NULL)​·​)​;​
3548 »   ​»   ​}3551 »   ​»   ​}
3549 »   ​}3552 »   ​}
3550 »   ​if·​(·​condorState·​!=·​IDLE·​&&·​condorState·​!=·​RUNNING·​)​·​{3553 »   ​if·​(·​condorState·​!=·​IDLE·​&&·​condorState·​!=·​RUNNING·​)​·​{
diff --git a/src/condor_includes/condor_header_features.h b/src/condor_includes/condor_header_features.h
index 0faf1c316f7faa86e65e21102f9e16b8605895b5..bfb199af940844b5931959ba8ed715235e475738 100644
a/​src/​condor_includes/​condor_header_feature​s.​hb/​src/​condor_includes/​condor_header_feature​s.​h
34 #define·​DLL_IMPORT_MAGIC··​/​*·​a·​no-op·​on·​Unix·​*/​34 #define·​DLL_IMPORT_MAGIC··​/​*·​a·​no-op·​on·​Unix·​*/​
35 #endif35 #endif
36 36
37 #ifdef·WIN3237 #ifdef·_MSC_VER
38 #define·​SUPPRESS_WIN32_WARNIN​G(nn)​·warning(suppress:​nn)​38 #define·MSC_PRAGMA1(type)​·······__pragma(type)​
39 #define·DISABLE_WIN32_WARNING​(nn)​··warning(disable:​nn)​39 #define·MSC_PRAGMA2(type,​nn)​····__pragma(type(nn)​)​
40 #define·​MSC_PRAGMA3(type,​op,​nn)​·​__pragma(type(op:​nn)​)​
40 #else41 #else
41 #define·SUPPRESS_WIN32_WARNIN​G(nn)​·/​*·a·no-op·on·Unix·*/​42 #define·MSC_PRAGMA1(type)​
42 #define·DISABLE_WIN32_WARNING​(nn)​··/​*·a·no-op·on·Unix·*/​43 #define·MSC_PRAGMA2(type,​nn)​
44 #define·​MSC_PRAGMA3(type,​op,​nn)​
43 #endif45 #endif
44 46
47 #define·​MSC_SUPPRESS_WARNING_​FOREVER(nn)​·​MSC_PRAGMA3(warning,​suppress,​nn)​·​/​/​·​warning·​is·​bogus,​·​we·​want·​to·​do·​this
48 #define·​MSC_SUPPRESS_WARNING_​FIXME(nn)​·​MSC_PRAGMA3(warning,​suppress,​nn)​·​/​/​·​warning·​is·​valid,​·​but·​too·​hard·​to·​fix.​
49 #define·​MSC_SUPPRESS_WARNING(​nn)​·​MSC_PRAGMA3(warning,​suppress,​nn)​
50 #define·​MSC_DISABLE_WARNING(n​n)​··​MSC_PRAGMA3(warning,​disable,​nn)​
51 #define·​MSC_RESTORE_WARNING(n​n)​··​MSC_PRAGMA3(warning,​default,​nn)​
52
45 53
46 /​*·​If·​this·​platform·​doesn't·​give·​us·​__FUNCTION__·​create·​a·​default.​54 /​*·​If·​this·​platform·​doesn't·​give·​us·​__FUNCTION__·​create·​a·​default.​
47 ·​*/​55 ·​*/​
diff --git a/src/condor_sysapi/free_fs_blocks.cpp b/src/condor_sysapi/free_fs_blocks.cpp
index d8790063b3129dab63124248c6f1380bf34b934e..9ef811f7e242815bcb95e7c45f6d3d23b98b4e19 100644
a/​src/​condor_sysapi/​free_fs_blocks.​cppb/​src/​condor_sysapi/​free_fs_blocks.​cpp
45 {45 {
46 »   ​ULARGE_INTEGER·​FreeBytesAvailableToC​aller,​·​TotalNumberOfBytes,​·​TotalNumberOfFreeByte​s;​46 »   ​ULARGE_INTEGER·​FreeBytesAvailableToC​aller,​·​TotalNumberOfBytes,​·​TotalNumberOfFreeByte​s;​
47 »   ​unsigned·​int·​t_hi,​·​t_lo,​·​temp;​47 »   ​unsigned·​int·​t_hi,​·​t_lo,​·​temp;​
48 »   ​const·​unsigned·​int·​lowest_ten_mask·​=·​0x00000cff;​48 »   ​const·​unsigned·​int·​lowest_ten_mask·​=·​0x000003ff;​
49 »   ​49 »   ​
50 »   ​t_hi·​=·​t_lo·​=·​temp·​=·​0;​50 »   ​t_hi·​=·​t_lo·​=·​temp·​=·​0;​
51 »   ​sysapi_internal_recon​fig()​;​51 »   ​sysapi_internal_recon​fig()​;​
diff --git a/src/condor_utils/classad_log.cpp b/src/condor_utils/classad_log.cpp
index a2b88e40bf926a70ac418c74805f961c0a38f4d1..afce6afeb6d2a359f9693aeef7ac42474a17c1cb 100644
a/​src/​condor_utils/​classad_log.​cppb/​src/​condor_utils/​classad_log.​cpp
665 »   ​return·​1;​665 »   ​return·​1;​
666 }666 }
667 667
668
668 int669 int
669 LogHistoricalSequence​Number:​:​ReadBody(FILE·​*fp)​670 LogHistoricalSequence​Number:​:​ReadBody(FILE·​*fp)​
670 {671 {
672 »   ​char·​*buf·​=·​NULL;​673 »   ​char·​*buf·​=·​NULL;​
673 »   ​rval·​=·​readword(fp,​·​buf)​;​674 »   ​rval·​=·​readword(fp,​·​buf)​;​
674 »   ​if·​(rval·​<·​0)​·​return·​rval;​675 »   ​if·​(rval·​<·​0)​·​return·​rval;​
676 »   ​MSC_SUPPRESS_WARNING_​FIXME(6031)​/​/​·​return·​value·​of·​scanf·​ignored.​
675 »   ​sscanf(buf,​"%lu",​&historical_sequence_​number)​;​677 »   ​sscanf(buf,​"%lu",​&historical_sequence_​number)​;​
676 »   ​free(buf)​;​678 »   ​free(buf)​;​
677 679
682 684
683 »   ​rval1·​=·​readword(fp,​·​buf)​;​685 »   ​rval1·​=·​readword(fp,​·​buf)​;​
684 »   ​if·​(rval1·​<·​0)​·​return·​rval1;​686 »   ​if·​(rval1·​<·​0)​·​return·​rval1;​
687 »   ​MSC_SUPPRESS_WARNING_​FIXME(6031)​/​/​·​return·​value·​of·​scanf·​ignored.​
685 »   ​sscanf(buf,​"%lu",​&timestamp)​;​688 »   ​sscanf(buf,​"%lu",​&timestamp)​;​
686 »   ​free(buf)​;​689 »   ​free(buf)​;​
687 »   ​return·​rval·​+·​rval1;​690 »   ​return·​rval·​+·​rval1;​
691 LogHistoricalSequence​Number:​:​WriteBody(FILE·​*fp)​694 LogHistoricalSequence​Number:​:​WriteBody(FILE·​*fp)​
692 {695 {
693 »   ​char·​buf[100];​696 »   ​char·​buf[100];​
694 »   ​snprintf(buf,​100,​"%lu·​CreationTimestamp·​%lu",​697 »   ​snprintf(buf,​COUNTOF(buf)​,​"%lu·​CreationTimestamp·​%lu",​
695 »   ​»   ​historical_sequence_n​umber,​timestamp)​;​698 »   ​»   ​historical_sequence_n​umber,​timestamp)​;​
699 »   ​buf[COUNTOF(buf)​-1]·​=·​0;​·​/​/​·​snprintf·​not·​guranteed·​to·​null·​terminate.​
696 »   ​int·​len·​=·​strlen(buf)​;​700 »   ​int·​len·​=·​strlen(buf)​;​
697 »   ​return·​(fwrite(buf,​·​1,​·​len,​·​fp)​·​<·​(unsigned)​len)​·​?·​-1:​·​len;​701 »   ​return·​(fwrite(buf,​·​1,​·​len,​·​fp)​·​<·​(unsigned)​len)​·​?·​-1:​·​len;​
698 }702 }
diff --git a/src/condor_utils/condor_pidenvid.cpp b/src/condor_utils/condor_pidenvid.cpp
index 30c1f52162a53e8d28312ba8c2513d64937a7be5..76d9591b4760ede16ba602258e01e412507ac887 100644
a/​src/​condor_utils/​condor_pidenvid.​cppb/​src/​condor_utils/​condor_pidenvid.​cpp
106 »   ​}106 »   ​}
107 107
108 »   ​/​*·​Here·​is·​the·​representation·​which·​will·​end·​up·​in·​an·​environment·108 »   ​/​*·​Here·​is·​the·​representation·​which·​will·​end·​up·​in·​an·​environment·
109 »   ​»   ​somewhere·​*/​109 »   ​»   ​somewhere.​·time_t·doesn't·always·match·%lu,​·so·coerce·it*/​
110 »   ​sprintf(dest,​·​"%s%d=%d%s%lu%s%u",​·110 »   ​sprintf(dest,​·​"%s%d=%d%s%lu%s%u",​·
111 »   ​»   ​»   ​PIDENVID_PREFIX,​·​forker_pid,​·111 »   ​»   ​»   ​PIDENVID_PREFIX,​·​forker_pid,​·
112 »   ​»   ​»   ​forked_pid,​·​PIDENVID_SEP,​·​t,​·​PIDENVID_SEP,​·​mii)​;​112 »   ​»   ​»   ​forked_pid,​·​PIDENVID_SEP,​·(long)​t,​·​PIDENVID_SEP,​·​mii)​;​
113 113
114 »   ​return·​PIDENVID_OK;​114 »   ​return·​PIDENVID_OK;​
115 }115 }
119 »   ​»   ​pid_t·​*forked_pid,​·​time_t·​*t,​·​unsigned·​int·​*mii)​119 »   ​»   ​pid_t·​*forked_pid,​·​time_t·​*t,​·​unsigned·​int·​*mii)​
120 {120 {
121 »   ​int·​rval;​121 »   ​int·​rval;​
122 »   ​long·​tmpt·​=·​(long)​(*t)​;​·​/​/​·​because·​time_t·​doesn't·​always·​match·​%lu
122 123
123 »   ​/​*·​rip·​out·​the·​values·​I·​care·​about·​and·​into·​the·​arguments·​*/​124 »   ​/​*·​rip·​out·​the·​values·​I·​care·​about·​and·​into·​the·​arguments·​*/​
124 »   ​rval·​=·​sscanf(src,​·125 »   ​rval·​=·​sscanf(src,​·
125 »   ​»   ​PIDENVID_PREFIX·​"%d=%d"·​PIDENVID_SEP·​"%lu"·​PIDENVID_SEP·​"%u",​·126 »   ​»   ​PIDENVID_PREFIX·​"%d=%d"·​PIDENVID_SEP·​"%lu"·​PIDENVID_SEP·​"%u",​·
126 »   ​»   ​forker_pid,​·​forked_pid,​·​t,​·​mii)​;​127 »   ​»   ​forker_pid,​·​forked_pid,​·&tmpt,​·​mii)​;​
127 128 »   ​*t·=·tmpt;​
128 »   ​/​*·​There·​are·​4·​things·​I'm·​taking·​out·​of·​the·​string,​·​make·​sure·​I·​get·​them·​*/​129 »   ​/​*·​There·​are·​4·​things·​I'm·​taking·​out·​of·​the·​string,​·​make·​sure·​I·​get·​them·​*/​
129 »   ​if·​(rval·​==·​4)​·​{130 »   ​if·​(rval·​==·​4)​·​{
130 »   ​»   ​return·​PIDENVID_OK;​131 »   ​»   ​return·​PIDENVID_OK;​
diff --git a/src/condor_utils/generic_stats.h b/src/condor_utils/generic_stats.h
index ac59e3d878f7ff9df852e4a1371eccb8c5f0108f..26e8ddefb327136825d9c19b46b53b244b85308c 100644
a/​src/​condor_utils/​generic_stats.​hb/​src/​condor_utils/​generic_stats.​h
206 ···​T*··​pbuf;​···​/​/​·​allocated·​buffer·​for·​the·​ring.​206 ···​T*··​pbuf;​···​/​/​·​allocated·​buffer·​for·​the·​ring.​
207 207
208 ···​T&·​operator[](int·​ix)​·​{·208 ···​T&·​operator[](int·​ix)​·​{·
209 /​/​#pragma·​SUPPRESS_WIN32_WARNIN​G(6011)​·​/​/​·​dereferencing·​null·​pointer.​
210 ······​/​/​·​yes,​·​we·​do·​want·​to·​segfault·​if·​pbuf==NULL209 ······​/​/​·​yes,​·​we·​do·​want·​to·​segfault·​if·​pbuf==NULL
211 ······if·(·!·pbuf·||·!·cMax)​·{210 ······MSC_SUPPRESS_WARNING_​FOREVER(6011)​·/​/​·dereferencing·null·pointer.​
212 ·········if·(pbuf)​211 ······if·(·!·pbuf·||·!·cMax)​·return·pbuf[0];​
213 ············​return·​pbuf[0];​
214 ·········​else
215 ············​return·​*((T*)​0)​;​
216 ······​}
217 ······​return·​pbuf[(ixHead+ix+cMax)​·​%·​cMax];​212 ······​return·​pbuf[(ixHead+ix+cMax)​·​%·​cMax];​
218 ···​}213 ···​}
219 214
diff --git a/src/condor_utils/log.cpp b/src/condor_utils/log.cpp
index 3b46b75408b97768bd2fcdac2db4eeb03a821827..3259c7c022b59d7ff010bc55650ff728e9c69840 100644
a/​src/​condor_utils/​log.​cppb/​src/​condor_utils/​log.​cpp
55 »   ​char»   ​*buf·​=·​(char·​*)​malloc(bufsize)​;​55 »   ​char»   ​*buf·​=·​(char·​*)​malloc(bufsize)​;​
56 »   ​int·​ch;​56 »   ​int·​ch;​
57 57
58 »   ​if·​(·​!·​buf)​
59 »   ​»   ​return·​-1;​
60
58 »   ​/​/​·​ignore·​leading·​whitespace·​but·​don't·​pass·​newline61 »   ​/​/​·​ignore·​leading·​whitespace·​but·​don't·​pass·​newline
59 »   ​do·​{62 »   ​do·​{
60 »   ​»   ​ch·​=·​fgetc(·​fp·​)​;​63 »   ​»   ​ch·​=·​fgetc(·​fp·​)​;​
68 »   ​/​/​·​read·​until·​whitespace71 »   ​/​/​·​read·​until·​whitespace
69 »   ​for·​(i·​=·​1;​·​!isspace(buf[i-1])​;​·​i++)​·​{72 »   ​for·​(i·​=·​1;​·​!isspace(buf[i-1])​;​·​i++)​·​{
70 »   ​»   ​if·​(i·​==·​bufsize)​·​{73 »   ​»   ​if·​(i·​==·​bufsize)​·​{
71 »   ​»   ​»   ​buf·=·(char·*)​realloc(buf,​·​bufsize*2)​;​74 »   ​»   ​»   ​void·*·vbuf·=·realloc(buf,​·​bufsize*2)​;​
75 »   ​»   ​»   ​if·​(·​!·​vbuf)​·​{
76 »   ​»   ​»   ​»   ​free(buf)​;​
77 »   ​»   ​»   ​»   ​return·​-1;​
78 »   ​»   ​»   ​}
79 »   ​»   ​»   ​buf·​=·​(char·​*)​vbuf;​
72 »   ​»   ​»   ​bufsize·​*=·​2;​80 »   ​»   ​»   ​bufsize·​*=·​2;​
73 »   ​»   ​}·81 »   ​»   ​}·
74 »   ​»   ​ch·​=·​fgetc(·​fp·​)​;​82 »   ​»   ​ch·​=·​fgetc(·​fp·​)​;​
99 »   ​char»   ​*buf·​=·​(char·​*)​malloc(bufsize)​;​107 »   ​char»   ​*buf·​=·​(char·​*)​malloc(bufsize)​;​
100 »   ​int·​ch;​108 »   ​int·​ch;​
101 109
110 »   ​if·​(·​!·​buf)​
111 »   ​»   ​return·​-1;​
112
102 »   ​/​/​·​ignore·​one·​leading·​whitespace·​character·​but·​don't·​pass·​newline113 »   ​/​/​·​ignore·​one·​leading·​whitespace·​character·​but·​don't·​pass·​newline
103 »   ​ch·​=·​fgetc(·​fp·​)​;​114 »   ​ch·​=·​fgetc(·​fp·​)​;​
104 »   ​if(·​ch·​==·​EOF·​||·​ch·​==·​'\0'·​)​·​{115 »   ​if(·​ch·​==·​EOF·​||·​ch·​==·​'\0'·​)​·​{
110 »   ​/​/​·​read·​until·​newline121 »   ​/​/​·​read·​until·​newline
111 »   ​for·​(i·​=·​1;​·​buf[i-1]!='\n';​·​i++)​·​{122 »   ​for·​(i·​=·​1;​·​buf[i-1]!='\n';​·​i++)​·​{
112 »   ​»   ​if·​(i·​==·​bufsize)​·​{123 »   ​»   ​if·​(i·​==·​bufsize)​·​{
113 »   ​»   ​»   ​buf·=·(char·*)​realloc(buf,​·​bufsize*2)​;​124 »   ​»   ​»   ​void·*·vbuf·=·realloc(buf,​·​bufsize*2)​;​
125 »   ​»   ​»   ​if·​(·​!·​vbuf)​·​{
126 »   ​»   ​»   ​»   ​free(buf)​;​
127 »   ​»   ​»   ​»   ​return·​-1;​
128 »   ​»   ​»   ​}
129 »   ​»   ​»   ​buf·​=·​(char·​*)​vbuf;​
114 »   ​»   ​»   ​bufsize·​*=·​2;​130 »   ​»   ​»   ​bufsize·​*=·​2;​
115 »   ​»   ​}·131 »   ​»   ​}·
116 »   ​»   ​ch·​=·​fgetc(·​fp·​)​;​132 »   ​»   ​ch·​=·​fgetc(·​fp·​)​;​
diff --git a/src/condor_utils/my_popen.cpp b/src/condor_utils/my_popen.cpp
index 4151c048bdaf81781d1596488111eb379bf7e91c..dd236c795e96c709671b1c58469b86fb4436f051 100644
a/​src/​condor_utils/​my_popen.​cppb/​src/​condor_utils/​my_popen.​cpp
47 47
48 static·​void·​add_child(FILE*·​fp,​·​child_handle_t·​ch)​48 static·​void·​add_child(FILE*·​fp,​·​child_handle_t·​ch)​
49 {49 {
50 »   ​MSC_SUPPRESS_WARNING_​FIXME(6011)​·​/​/​·​Dereferencing·​a·​null·​pointer,​·​malloc·​can·​return·​NULL.​
50 »   ​struct·​popen_entry·​*pe·​=·​(struct·​popen_entry·​*)​malloc(sizeof(struct·​popen_entry)​)​;​51 »   ​struct·​popen_entry·​*pe·​=·​(struct·​popen_entry·​*)​malloc(sizeof(struct·​popen_entry)​)​;​
51 »   ​pe->fp·​=·​fp;​52 »   ​pe->fp·​=·​fp;​
52 »   ​pe->ch·​=·​ch;​53 »   ​pe->ch·​=·​ch;​
diff --git a/src/condor_utils/param_info.in b/src/condor_utils/param_info.in
index dc29c44a41ea73226ef73989dfba2d438dc54d01..e11e43cff2a9c8f26022a210810b20a4e18c5d7c 100644
a/​src/​condor_utils/​param_info.​inb/​src/​condor_utils/​param_info.​in
4100 tags=gridmanager,​proxymanager4100 tags=gridmanager,​proxymanager
4101 id=2244101 id=224
4102 4102
4103 [GRIDMANAGER_PROXY_RE​FRESH_TIME]
4104 aliases=
4105 default=21600
4106 version=0.​0.​0
4107 range=.​*
4108 state=default
4109 type=string
4110 is_macro=false
4111 reconfig=true
4112 customization=seldom
4113 friendly_name=Gridman​ager·​Proxy·​Refresh·​Time
4114 usage=
4115 url=http:​/​/​cs.​wisc.​edu/​condor/​manual/​v7.​3/​3_3Configuration.​html#SECTION
4116 tags=gridmanager,​proxymanager
4117 id=224
4118
4103 [CONDOR_GAHP]4119 [CONDOR_GAHP]
4104 aliases=4120 aliases=
4105 default=$(SBIN)​/​condor_c-gahp4121 default=$(SBIN)​/​condor_c-gahp
diff --git a/src/gt2_gahp/my_ez.cpp b/src/gt2_gahp/my_ez.cpp
index 0276ac29d2e9effe18786adb43d847adc81d0a8b..6b9fa28e731b2ab12593677b55f085c789639082 100644
a/​src/​gt2_gahp/​my_ez.​cppb/​src/​gt2_gahp/​my_ez.​cpp
665 ············​if(amt·​==·​-1)​665 ············​if(amt·​==·​-1)​
666 ············​{666 ············​{
667 ················​globus_free(buf)​;​667 ················​globus_free(buf)​;​
668 ················​close(rc)​;​
668 ················​goto·​deny;​669 ················​goto·​deny;​
669 ············​}670 ············​}
670 ············​globus_gass_transfer_​authorize(request,​671 ············​globus_gass_transfer_​authorize(request,​
diff --git a/src/nordugrid_gahp/globus_ftp_client_attr.c b/src/nordugrid_gahp/globus_ftp_client_attr.c
index a36a59effb2d30ad120b503a8d841e9b3234d3f8..b92def3b23ef049bcbb4132ccda08d7d3b36164c 100644
a/​src/​nordugrid_gahp/​globus_ftp_client_att​r.​cb/​src/​nordugrid_gahp/​globus_ftp_client_att​r.​c
2571 ····​{2571 ····​{
2572 »   ​i_attr->auth_info.​password·​=·​GLOBUS_NULL;​2572 »   ​i_attr->auth_info.​password·​=·​GLOBUS_NULL;​
2573 ····​}2573 ····​}
2574 ····​if(i_attr->auth_info.​account)​
2575 ····​{
2576 »   ​i_attr->auth_info.​account·​=·​GLOBUS_NULL;​
2577 ····​}
2574 ····​if(i_attr->auth_info.​auth_gssapi_subject)​2578 ····​if(i_attr->auth_info.​auth_gssapi_subject)​
2575 ····​{2579 ····​{
2576 »   ​i_attr->auth_info.​auth_gssapi_subject·​=·​GLOBUS_NULL;​2580 »   ​i_attr->auth_info.​auth_gssapi_subject·​=·​GLOBUS_NULL;​