diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2010-06-19 09:05:29 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2010-06-19 09:05:29 +0000 |
| commit | cd39cdcaac4bb080e939cd79288a3fa626528f7f (patch) | |
| tree | 9ff9f55a84f988b8095d02240e74ae91eddd3e24 /main/open-iscsi/CVE-2009-1297.patch | |
| parent | 85fd77589be2f6c970ca6895afa1520e0a2fda04 (diff) | |
| parent | bf31029cd1255d11b787a857a103139ddbe2b29d (diff) | |
| download | aports-cd39cdcaac4bb080e939cd79288a3fa626528f7f.tar.bz2 aports-cd39cdcaac4bb080e939cd79288a3fa626528f7f.tar.xz | |
Merge remote branch 'alpine/master'
Diffstat (limited to 'main/open-iscsi/CVE-2009-1297.patch')
| -rw-r--r-- | main/open-iscsi/CVE-2009-1297.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/main/open-iscsi/CVE-2009-1297.patch b/main/open-iscsi/CVE-2009-1297.patch new file mode 100644 index 0000000000..d1728fff7e --- /dev/null +++ b/main/open-iscsi/CVE-2009-1297.patch @@ -0,0 +1,31 @@ +--- utils.orig/iscsi_discovery 2009-10-26 23:09:08.000000000 +0100 ++++ utils/iscsi_discovery 2009-10-26 23:11:56.000000000 +0100 +@@ -104,24 +104,22 @@ + + connected=0 + discovered=0 +- df=/tmp/discovered.$$ + + dbg "starting discovery to $ip" +- iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df} +- while read portal target ++ disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})" ++ echo "${disc}" | while read portal target + do + portal=${portal%,*} + select_transport +- done < ${df} ++ done + +- discovered=$(cat ${df} | wc -l) ++ discovered=$(echo "${disc}" | wc -l) + if [ ${discovered} = 0 ]; then + echo "failed to discover targets at ${ip}" + exit 2 + else + echo "discovered ${discovered} targets at ${ip}" + fi +- /bin/rm -f ${df} + } + + try_login() |