diff options
| author | Eloy Paris <peloy@samba.org> | 2003-07-03 04:06:28 +0000 |
|---|---|---|
| committer | Eloy Paris <peloy@samba.org> | 2003-07-03 04:06:28 +0000 |
| commit | 91100b67e63e5ac127af92a0bc70bcfa53c64be3 (patch) | |
| tree | c7e53390785a54d00a3c11f6710af0e1f015399f /packaging/Debian/debian/samba-common.config | |
| parent | a31a2c159cd51112abdbe230c7a4df743fe14288 (diff) | |
| download | samba-91100b67e63e5ac127af92a0bc70bcfa53c64be3.tar.gz samba-91100b67e63e5ac127af92a0bc70bcfa53c64be3.tar.bz2 samba-91100b67e63e5ac127af92a0bc70bcfa53c64be3.zip | |
More Debian updates.
(This used to be commit 1f7de8c42e05c70cdb76c4f917b7ff128f5249e6)
Diffstat (limited to 'packaging/Debian/debian/samba-common.config')
| -rw-r--r-- | packaging/Debian/debian/samba-common.config | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/packaging/Debian/debian/samba-common.config b/packaging/Debian/debian/samba-common.config index b5ab6e81d5..ed76b95cb8 100644 --- a/packaging/Debian/debian/samba-common.config +++ b/packaging/Debian/debian/samba-common.config @@ -78,7 +78,6 @@ if [ -f $FILE ]; then CHARSET=`smbconf_retr "character set"` CODEPAGE=`smbconf_retr "client code page"` - DISPLAYCHARSET=`smbconf_retr "display charset"` UNIXCHARSET=`smbconf_retr "unix charset"` DOSCHARSET=`smbconf_retr "dos charset"` @@ -110,10 +109,10 @@ db_input medium samba-common/encrypt_passwords || true db_go # Handle migrating character sets -if [ -n "$CHARSET" -a -z "$DISPLAYCHARSET" -a -z "$UNIXCHARSET" ] +if [ -n "$CHARSET" -a -z "$UNIXCHARSET" ] then - DISPLAYCHARSET=`echo $CHARSET | sed -e's/iso-/ISO/i'` - db_set samba-common/character_set "$DISPLAYCHARSET" + UNIXCHARSET=`echo $CHARSET | sed -e's/iso-/ISO/i'` + db_set samba-common/character_set "$UNIXCHARSET" # FIXME: should eventually be low. db_input medium samba-common/character_set || true db_go |