diff options
author | Michael Brown | 2008-03-21 23:55:59 +0100 |
---|---|---|
committer | Michael Brown | 2008-03-21 23:55:59 +0100 |
commit | a462c96ffc1e7d378c783823f768a47d323dd210 (patch) | |
tree | 3b4dc63908ea6535b454be3e2af041782c0353ef /src/net/tcp | |
parent | [Settings] Migrate DHCP and NVO code to the new settings API (untested) (diff) | |
download | ipxe-a462c96ffc1e7d378c783823f768a47d323dd210.tar.gz ipxe-a462c96ffc1e7d378c783823f768a47d323dd210.tar.xz ipxe-a462c96ffc1e7d378c783823f768a47d323dd210.zip |
[Settings] DHCP is now working using the new settings API.
Diffstat (limited to 'src/net/tcp')
-rw-r--r-- | src/net/tcp/iscsi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c index 0e7b2582..f071b04a 100644 --- a/src/net/tcp/iscsi.c +++ b/src/net/tcp/iscsi.c @@ -1649,8 +1649,10 @@ static int apply_iscsi_string_setting ( struct iscsi_string_setting *setting ){ /* Allocate new string */ prefix_len = strlen ( setting->prefix ); setting_len = fetch_setting_len ( NULL, setting->tag ); - if ( setting_len < 0 ) - return setting_len; + if ( setting_len < 0 ) { + /* Missing settings are not errors; leave strings as NULL */ + return 0; + } len = ( prefix_len + setting_len + 1 ); p = *setting->string = malloc ( len ); if ( ! p ) |