projects
/
shibboleth
/
cpp-sp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d132a8d
)
Handle paths with spaces in them
author
Scott Cantor
<cantor.2@osu.edu>
Fri, 18 May 2012 21:11:34 +0000
(21:11 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Fri, 18 May 2012 21:11:34 +0000
(21:11 +0000)
configs/keygen.bat-wix
patch
|
blob
|
history
diff --git
a/configs/keygen.bat-wix
b/configs/keygen.bat-wix
index
45c9e11
..
b2ba408
100644
(file)
--- a/
configs/keygen.bat-wix
+++ b/
configs/keygen.bat-wix
@@
-46,7
+46,7
@@
echo CN=%FQDN% >>%CNF%
echo [ext] >>%CNF%
\r
if defined ENTITYID (echo subjectAltName=DNS:%FQDN%,URI:%ENTITYID% >>%CNF%) else (echo subjectAltName=DNS:%FQDN% >>%CNF%)
\r
echo subjectKeyIdentifier=hash >>%CNF%
\r
echo [ext] >>%CNF%
\r
if defined ENTITYID (echo subjectAltName=DNS:%FQDN%,URI:%ENTITYID% >>%CNF%) else (echo subjectAltName=DNS:%FQDN% >>%CNF%)
\r
echo subjectKeyIdentifier=hash >>%CNF%
\r
-openssl.exe req -config %
PREFIX%sp-cert.cnf -new -x509 -days %DAYS% -keyout %PREFIX%sp-key.pem -out %PREFIX%sp-cert.pem
\r
+openssl.exe req -config %
CNF% -new -x509 -days %DAYS% -keyout "%PREFIX%sp-key.pem" -out "%PREFIX%sp-cert.pem"
\r
del %CNF%
\r
exit /b
\r
\r
del %CNF%
\r
exit /b
\r
\r
@@
-92,7
+92,7
@@
if defined USERDNSDOMAIN set FQDN=%USERDNSDOMAIN%
for /F %%i in ('hostname') do set HOST=%%i
\r
if defined FQDN (set FQDN=%HOST%.%FQDN%) else (set FQDN=%HOST%)
\r
\r
for /F %%i in ('hostname') do set HOST=%%i
\r
if defined FQDN (set FQDN=%HOST%.%FQDN%) else (set FQDN=%HOST%)
\r
\r
-echo >
%FQDN%
\r
+echo >
"%FQDN%"
\r
for /F %%i in ('dir /b/l %FQDN%') do set FQDN=%%i
\r
del %FQDN%
\r
goto generate
\r
for /F %%i in ('dir /b/l %FQDN%') do set FQDN=%%i
\r
del %FQDN%
\r
goto generate
\r