mirror of
https://github.com/samba-team/samba.git
synced 2025-08-03 04:22:09 +03:00
Remove use of 'F' - make 'f' and 'p' do unix (iso8859-1) encoding.
Jeremy.
This commit is contained in:
@ -235,13 +235,6 @@ pytdbpack_data(const char *format_str,
|
||||
|
||||
case 'f':
|
||||
case 'P':
|
||||
if (!(packed_list = pytdbpack_str(ch, val_iter, packed_list, pytdb_dos_encoding)))
|
||||
return NULL;
|
||||
break;
|
||||
|
||||
case 'F':
|
||||
/* We specify NULL encoding: Samba databases in this
|
||||
form are written in the default Python encoding. */
|
||||
if (!(packed_list = pytdbpack_str(ch, val_iter, packed_list, pytdb_unix_encoding)))
|
||||
return NULL;
|
||||
break;
|
||||
@ -668,9 +661,6 @@ static PyObject *pytdbunpack_item(char ch,
|
||||
result = pytdbunpack_uint32(pbuf, plen);
|
||||
}
|
||||
else if (ch == 'f' || ch == 'P') { /* nul-term string */
|
||||
result = pytdbunpack_string(pbuf, plen, pytdb_dos_encoding);
|
||||
}
|
||||
else if (ch == 'F') { /* nul-term string */
|
||||
result = pytdbunpack_string(pbuf, plen, pytdb_unix_encoding);
|
||||
}
|
||||
else if (ch == 'B') { /* length, buffer */
|
||||
|
Reference in New Issue
Block a user