October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41482 - in /trunk/squid: ./ agents/ agents/config/ agents/src/ src/
by dfiser＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: dfiser Date: Fri Oct 19 12:50:27 2007 New Revision: 41482 URL: http://svn.opensuse.org/viewcvs/yast?rev=41482&view=rev Log: - Created new SCR agent for squid.conf file. Added: trunk/squid/agents/config/ trunk/squid/agents/config/Makefile.am trunk/squid/agents/config/squid.scr trunk/squid/agents/src/ trunk/squid/agents/src/Makefile.am trunk/squid/agents/src/Y2CCSquidAgent.cc trunk/squid/agents/src/debug.h trunk/squid/agents/src/main.cpp trunk/squid/agents/src/squid_agent.cpp trunk/squid/agents/src/squid_agent.h trunk/squid/agents/src/squid_file.cpp trunk/squid/agents/src/squid_file.h trunk/squid/agents/src/squid_parser.cpp trunk/squid/agents/src/squid_parser.h Removed: trunk/squid/agents/squid.scr Modified: trunk/squid/agents/Makefile.am trunk/squid/configure.in.in trunk/squid/src/Squid.ycp trunk/squid/yast2-squid.spec.in Modified: trunk/squid/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/Makefile.am?rev=414… ============================================================================== --- trunk/squid/agents/Makefile.am (original) +++ trunk/squid/agents/Makefile.am Fri Oct 19 12:50:27 2007 @@ -1,7 +1,3 @@ # Makefile.am for squid/agents +SUBDIRS = src config -agent_SCRIPTS = - -scrconf_DATA = squid.scr - -EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Added: trunk/squid/agents/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/config/Makefile.am?… ============================================================================== --- trunk/squid/agents/config/Makefile.am (added) +++ trunk/squid/agents/config/Makefile.am Fri Oct 19 12:50:27 2007 @@ -0,0 +1,5 @@ +# Makefile.am for squid/agents + +scrconf_DATA = squid.scr + +EXTRA_DIST = $(scrconf_DATA) Added: trunk/squid/agents/config/squid.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/config/squid.scr?re… ============================================================================== --- trunk/squid/agents/config/squid.scr (added) +++ trunk/squid/agents/config/squid.scr Fri Oct 19 12:50:27 2007 @@ -0,0 +1,35 @@ +/** + * File: squid.scr + * Summary: + * SCR agent for reading/writing /etc/squid/squid.conf using + * ini-agent + * Access: read/write + * Authors: Daniel Fiser <dfiser(a)suse.cz> + * Example: + * `Dir(.squid) + * (["http_port", "hierarchy_stoplist", "acl", "cache", "acl", ... ]) + * + * `Read(.squid.http_port) + * (["3128 transparent"]) + * + * `Write(.squid.http_port,"3128 accel") + * true + * + * .etc.squid + * + * `ag_ini( + * `IniAgent("/etc/squid/squid.conf", + * $["params" : [ + * $["match" : ["^[ \t]*([^ \t]+)[ \t]+(.+)[ \t]*$", "%s %s"]] + * ], + * "comments" : ["#.*$", "^[ \t]*$"], + * "options" : ["flat", "repeat_names", "global_values"] + * ] + * ) + * ) + */ +.etc.squid + +`ag_squid( + `SquidAgent("/etc/squid/squid.conf") +) Added: trunk/squid/agents/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/src/Makefile.am?rev… ============================================================================== --- trunk/squid/agents/src/Makefile.am (added) +++ trunk/squid/agents/src/Makefile.am Fri Oct 19 12:50:27 2007 @@ -0,0 +1,28 @@ +# +# Makefile.am for core/agent-ini/src +# + +AM_CXXFLAGS = -DY2LOG=\"agent-squid\" -Wall -DNDEBUG + +plugin_LTLIBRARIES = libpy2ag_squid.la +noinst_LTLIBRARIES = liby2ag_squid.la + +liby2ag_squid_la_SOURCES = \ + squid_agent.cpp squid_agent.h \ + squid_parser.cpp squid_parser.h \ + squid_file.cpp squid_file.h + +liby2ag_squid_la_LDFLAGS = -version-info 2:0 +liby2ag_squid_la_LIBADD = @AGENT_LIBADD@ + +libpy2ag_squid_la_SOURCES = \ + $(liby2ag_squid_la_SOURCES) \ + Y2CCSquidAgent.cc + +libpy2ag_squid_la_LDFLAGS = -version-info 2:0 \ + -lboost_regex +libpy2ag_squid_la_LIBADD = \ + @AGENT_LIBADD@ \ + ${Y2UTIL_LIBS} + +INCLUDES = -I$(includedir) Added: trunk/squid/agents/src/Y2CCSquidAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/src/Y2CCSquidAgent.… ============================================================================== --- trunk/squid/agents/src/Y2CCSquidAgent.cc (added) +++ trunk/squid/agents/src/Y2CCSquidAgent.cc Fri Oct 19 12:50:27 2007 @@ -0,0 +1,14 @@ +#undef Y2LOG +#define Y2LOG "scr" +#include <scr/Y2AgentComponent.h> +#include <scr/Y2CCAgentComponent.h> +#undef Y2LOG +#define Y2LOG "agent-squid" + +#include "squid_agent.h" + + +typedef Y2AgentComp <SquidAgent> Y2SquidAgentComp; + +Y2CCAgentComp <Y2SquidAgentComp> g_y2ccag_squid ("ag_squid"); + Added: trunk/squid/agents/src/debug.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/src/debug.h?rev=414… ============================================================================== --- trunk/squid/agents/src/debug.h (added) +++ trunk/squid/agents/src/debug.h Fri Oct 19 12:50:27 2007 @@ -0,0 +1,16 @@ +#ifndef _DEBUG_H_ +#define _DEBUG_H_ + +#ifndef NDEBUG +#include <iostream> +#define DBG(exp) \ + std::cerr << exp << std::endl; \ + std::cerr.flush() +#define DBG2(exp) \ + std::cerr << exp; \ + std::cerr.flush() +#else +#define DBG(exp) +#endif + +#endif Added: trunk/squid/agents/src/main.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/src/main.cpp?rev=41… ============================================================================== --- trunk/squid/agents/src/main.cpp (added) +++ trunk/squid/agents/src/main.cpp Fri Oct 19 12:50:27 2007 @@ -0,0 +1,10 @@ +#include "squid_parser.h" + + + +int main(int argc, char *argv[]) +{ + SquidParser parser("/etc/squid/squid.conf"); + parser.parse(); + return 0; +} Added: trunk/squid/agents/src/squid_agent.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/src/squid_agent.cpp… ============================================================================== --- trunk/squid/agents/src/squid_agent.cpp (added) +++ trunk/squid/agents/src/squid_agent.cpp Fri Oct 19 12:50:27 2007 @@ -0,0 +1,159 @@ +#include "squid_agent.h" +using std::string; + +SquidAgent::~SquidAgent() +{ + if (_parser != NULL) + delete _parser; +} + +YCPValue SquidAgent::Read(const YCPPath &path, const YCPValue& arg, const YCPValue& optarg) +{ + if (_parser == NULL){ + y2warning("Can't execute Dir before being mounted."); + return YCPNull(); + } + + YCPList ret; + vector<vector<string> > *params; + int len, len2; + string option_name; + + if (path->length() == 1){ + option_name = path->component_str(0); + params = _parser->file.paramsOfOption(option_name); + len = params->size(); + + for (int i=0; i < len; i++){ + YCPList sublist; + len2 = (*params)[i].size(); + + for (int j=0; j < len2; j++){ + sublist.add(YCPString((*params)[i][j])); + } + ret.add(sublist); + } + + delete params; + } + + return ret; +} + +/** + * Helper function. + */ +static bool convertYCPListOfListOfStringToStd(const YCPList &value, vector<vector<string> > &std) +{ + int len = value->size(); + int len2; + YCPValue val, val2; + + DBG("len: " << len); + for (int i=0; i < len; i++){ + val = value->value(i); + if (val->isList()){ + vector<string> vec; + + len2 = val->asList()->size(); + + for (int j=0; j < len2; j++){ + val2 = val->asList()->value(j); + if (val2->isString()){ + vec.push_back(val2->asString()->value()); + }else{ + return false; + } + } + + std.push_back(vec); + }else{ + return false; + } + } + + return true; +} + +YCPBoolean SquidAgent::Write(const YCPPath &path, const YCPValue& value, const YCPValue& arg) +{ + if (_parser == NULL){ + y2warning("Can't execute Dir before being mounted."); + return YCPBoolean(false); + } + + if (path->length() == 0){ // . + DBG("`Write command called with path length 0."); + return YCPBoolean(_parser->file.write()); + }else if (path->length() == 1 && value->isList()){ // .option + vector<vector<string> > std_value; + + if (convertYCPListOfListOfStringToStd(value->asList(), std_value)){ + _parser->file.changeOption(path->component_str(0), std_value); + return YCPBoolean(true); + } + + return YCPBoolean(false); + }else if (path->length() == 1 && value->isVoid()){ + vector<vector<string> > std_value; + + _parser->file.changeOption(path->component_str(0), std_value); + return YCPBoolean(true); + } + + return YCPBoolean(false); +} + +YCPList SquidAgent::Dir(const YCPPath& path) +{ + if (_parser == NULL){ + y2warning("Can't execute Dir before being mounted."); + return YCPNull(); + } + + YCPList ret; + vector<string> *options; + int len; + + if (path->isRoot() || path->toString() == ".all_options"){ + if (path->isRoot()){ + options = _parser->file.options(); + }else{ // path->toString() == ".all_options" + options = _parser->file.allOptions(); + } + + len = options->size(); + for (int i=0; i < len; i++){ + ret.add(YCPString((*options)[i])); + } + + delete options; + } + + return ret; +} + +YCPValue SquidAgent::otherCommand(const YCPTerm& term) +{ + string sym = term->name(); + + if (sym == "SquidAgent"){ + if (term->size() == 1){ + if (!term->value(0)->isString()){ + return YCPError("Bad initialization of SquidFile(): agrument must be string."); + } + + if (_parser != NULL) + delete _parser; + + _parser = new SquidParser(term->value(0)->asString()->value()); + _parser->parse(); + + return YCPVoid(); + }else{ + return YCPError("Bad initialization of SquidFile(): 1 argument expected."); + } + } + + return YCPNull(); +} Added: trunk/squid/agents/src/squid_agent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/src/squid_agent.h?r… ============================================================================== --- trunk/squid/agents/src/squid_agent.h (added) +++ trunk/squid/agents/src/squid_agent.h Fri Oct 19 12:50:27 2007 @@ -0,0 +1,65 @@ +#ifndef _SQUID_AGENT_H_ +#define _SQUID_AGENT_H_ + +#include <Y2.h> +#include <scr/SCRAgent.h> + +#include "squid_parser.h" + +/** + * This class provides SCR functionality. + * Only this class creates YCP values (not SquidParser even SquidFile). + */ +class SquidAgent : public SCRAgent{ + private: + SquidParser *_parser; + + public: + SquidAgent() : _parser(NULL){} + ~SquidAgent(); + + /** + * Provides SCR Read (). + * Returns list where each item refers to one line in conf file. Each item + * is list of parameters. + * For example: + * conf file: + * acl QUERY urlpath_regex cgi-bin \? + * acl apache rep_header Server ^Apache + * SCR::Read: + * [ ["QUERY", "urlpath_regex", "cgi-bin", "\?" ], + * ["apache", "rep_header", "Server", "^Apache"] + * ] + * + * @param path Path that should be read. + * @param arg Additional parameter. + */ + YCPValue Read(const YCPPath &path, const YCPValue& arg = YCPNull(), const YCPValue& optarg = YCPNull() ); + + /** + * Provides SCR Write (). + */ + YCPBoolean Write(const YCPPath &path, const YCPValue& value, const YCPValue& arg = YCPNull()); + + /** + * Provides SCR Dir(). + * If path is '.', than it returns list of available options (defined + * in conf file). + * If path is '.all_options' it returns list of all options found in + * conf file (even not defined - commented...). + * Otherwise returns empty list. + */ + YCPList Dir(const YCPPath& path); + + /** + * Used for mounting the agent. + * .scr file should look like: + * .etc.squid + * `ag_squid( + * `SquidAgent("/path/to/conf/file") + * ) + */ + YCPValue otherCommand(const YCPTerm& term); +}; + +#endif Added: trunk/squid/agents/src/squid_file.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/src/squid_file.cpp?… ============================================================================== --- trunk/squid/agents/src/squid_file.cpp (added) +++ trunk/squid/agents/src/squid_file.cpp Fri Oct 19 12:50:27 2007 @@ -0,0 +1,261 @@ +#include <algorithm> + +#include "squid_file.h" +using std::string; +using std::vector; +using std::map; +using std::ofstream; +using std::endl; +using std::find; + +// public: +SquidFile::SquidFile(std::string filename) : _filename(filename) +{ + _options_order.push_back("acl"); + + _options_order.push_back("cache"); + _options_order.push_back("broken_vary_encoding"); + _options_order.push_back("access_log"); + _options_order.push_back("follow_x_forwarder_for"); + + _options_order.push_back("http_access"); + _options_order.push_back("http_reply_access"); + _options_order.push_back("icp_access"); + _options_order.push_back("htcp_access"); + _options_order.push_back("htcp_clr_access"); + _options_order.push_back("miss_access"); + _options_order.push_back("cache_peer_access"); + _options_order.push_back("ident_lookup_access"); + _options_order.push_back("tcp_outgoing_tos"); + _options_order.push_back("tcp_outgoing_address"); + _options_order.push_back("reply_body_max_size"); + _options_order.push_back("log_access"); + _options_order.push_back("deny_info"); + _options_order.push_back("always_direct"); + _options_order.push_back("never_direct"); + _options_order.push_back("header_access"); + _options_order.push_back("snmp_access"); + _options_order.push_back("broken_posts"); +} + +SquidFile::~SquidFile() +{ + int len = _options.size(); + for (int i=0; i < len; i++){ + delete _options[i]; + } +} + +bool SquidFile::write() +{ + DBG("Writing squid conf file."); +/* +#ifndef NDEBUG + int len2 = _options.size(); + for (int i=0; i < len2; i++){ + DBG(""); + DBG("Option name: \"" << _options[i]->name << "\""); + DBG("Comments:"); + for (unsigned int j=0; j < _options[i]->comments.size(); j++){ + for (unsigned int k=0; k < _options[i]->comments[j].size(); k++){ + DBG(" " << _options[i]->comments[j][k]); + } + DBG(""); + } + + DBG("Values:"); + for (unsigned int j=0; j < _options[i]->options.size(); j++){ + DBG2(" "); + for (unsigned int k=0; k < _options[i]->options[j].size(); k++){ + DBG2(_options[i]->options[j][k] << " "); + } + DBG(""); + } + } +#endif +*/ + + int len; + ofstream fout(_filename.c_str()); + if (!fout) + return false; + + len = _options.size(); + for (int i=0; i < len; i++){ + _writeComments(_options[i]->comments, fout); + _writeOptions(_options[i]->name, _options[i]->options, fout); + fout << endl; + } + + return true; +} + +void SquidFile::addComments(string option_name, vector<string> &comments) +{ + if (option_name.size() == 0){ + option_block_t *new_block = new option_block_t; + new_block->comments.push_back(comments); + _options.push_back(new_block); + + return; + } + + int pos = _posInOptions(option_name); + if (pos == -1){ + option_block_t *new_block = new option_block_t; + vector<option_block_t *>::iterator it = _findProperPlace(option_name); + + new_block->name = option_name; + new_block->comments.push_back(comments); + _options.insert(it, new_block); + return; + } + + _options[pos]->comments.push_back(comments); +} + + +void SquidFile::addConfigOption(string option_name, vector<string> &options) +{ + if (option_name.size() == 0){ + DBG("Can't add option value withou option_name."); + return; + } + + int pos = _posInOptions(option_name); + if (pos == -1){ + option_block_t *new_block = new option_block_t; + vector<option_block_t *>::iterator it = _findProperPlace(option_name); + + new_block->name = option_name; + new_block->options.push_back(options); + _options.insert(it, new_block); + return; + } + + _options[pos]->options.push_back(options); +} + + +vector<string> *SquidFile::options() +{ + vector<string> *ret = new vector<string>(); + int len = _options.size(); + + for (int i=0; i < len; i++){ + if (_options[i]->name.size() > 0 && _options[i]->options.size() > 0) + ret->push_back(_options[i]->name); + } + + return ret; +} + +vector<string> *SquidFile::allOptions() +{ + vector<string> *ret = new vector<string>(); + int len = _options.size(); + + for (int i=0; i < len; i++){ + if (_options[i]->name.size() > 0) + ret->push_back(_options[i]->name); + } + + return ret; +} + +vector<vector<string> > *SquidFile::paramsOfOption(std::string option_name) +{ + vector<vector<string> > *ret = new vector<vector<string> >();; + int len; + int pos = _posInOptions(option_name); + + if (pos != -1){ + len = _options[pos]->options.size(); + for (int i=0; i < len; i++){ + ret->push_back(_options[pos]->options[i]); + } + } + + return ret; +} + + +void SquidFile::changeOption(string option_name, + vector<vector<string> > &params) +{ + int pos = _posInOptions(option_name); + if (pos == -1){ + int len = params.size(); + for (int i=0; i < len; i++){ + addConfigOption(option_name, params[i]); + } + }else{ + _options[pos]->options = params; + } +} + +// private: +int SquidFile::_posInOptions(std::string &name) const +{ + int len = _options.size(); + for (int i=0; i < len; i++){ + if (_options[i]->name == name) + return i; + } + return -1; +} + +void SquidFile::_writeComments(vector<vector<string> > &comments, + ofstream &fout) const +{ + int len, len2; + len = comments.size(); + + for (int i=0; i < len; i++){ + len2 = comments[i].size(); + for (int j=0; j < len2; j++){ + fout << comments[i][j] << endl; + } + } +} + +void SquidFile::_writeOptions(string &option_name, + vector<vector<string> > &options, ofstream &fout) const +{ + int len, len2; + len = options.size(); + + for (int i=0; i < len; i++){ + fout << option_name; + + len2 = options[i].size(); + for (int j=0; j < len2; j++){ + fout << " " << options[i][j]; + } + + fout << endl; + } +} + + +vector<SquidFile::option_block_t *>::iterator SquidFile::_findProperPlace(string &option_name) +{ + vector<option_block_t *>::iterator it; + vector<option_block_t *>::iterator it_end; + vector<string>::iterator it_order = + find(_options_order.begin(), _options_order.end(), option_name); + + if (it_order == _options_order.end() || + it_order+1 == _options_order.end()) + return _options.end(); + + it_order++; + it = _options.begin(); + it_end = _options.end(); + for (; it != it_end; it++){ + if (find(it_order, _options_order.end(), (*it)->name) != _options_order.end()) + break; + } + + return it; +} Added: trunk/squid/agents/src/squid_file.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/src/squid_file.h?re… ============================================================================== --- trunk/squid/agents/src/squid_file.h (added) +++ trunk/squid/agents/src/squid_file.h Fri Oct 19 12:50:27 2007 @@ -0,0 +1,119 @@ +#ifndef _SQUID_FILE_H_ +#define _SQUID_FILE_H_ + +#include <string> +#include <vector> +#include <map> +#include <fstream> +#include <iostream> + +#include "debug.h" + + +/** + * Class representing configuration file read by parser. + */ +class SquidFile{ + private: + /** + * Struct which defines block of conf file corresponding with one option. + */ + struct option_block_t{ + std::string name; /*! name of the option */ + /*! list of comments. Each comment is list of lines from which + * the comment consists of. */ + std::vector<std::vector<std::string> > comments; + /*! List of options. Each option is list of parameters. */ + std::vector<std::vector<std::string> > options; + }; + + /** + * Return position of option with name option_name in vector + * _options. + * If option_name is not in vector return -1. + */ + int _posInOptions(std::string &name) const; + + /** + * Write given comments to fout. + */ + void _writeComments(std::vector<std::vector<std::string> > &comments, + std::ofstream &fout) const; + /** + * Write given options to fout. + */ + void _writeOptions(std::string &option_name, + std::vector<std::vector<std::string> > &options, + std::ofstream &fout) const; + + /** + * Find proper place where to push comments or options with name + * option_name. This method find the place according to contents + * of variable _options_order. + */ + std::vector<option_block_t *>::iterator + _findProperPlace(std::string &option_name); + + + /** + * File where will be written settings. + */ + std::string _filename; + + /** + * List of read blocks of options. + */ + std::vector<option_block_t *> _options; + + /** + * Ordered list that defines in which order has to be options. + * (Some options must be defined before others) + * This list must be filled in constructor. + */ + std::vector<std::string> _options_order; + public: + SquidFile(std::string filename); + ~SquidFile(); + + /** + * Write settings. + */ + bool write(); + + /** + * Add comments to the list. + */ + void addComments(std::string option_name, std::vector<std::string> &comments); + + /** + * Add configuration option to the list. + */ + void addConfigOption(std::string option_name, std::vector<std::string> &options); + + + /** + * Returns list of all available options. + * Memory pointed by returned pointer must be freed! + */ + std::vector<std::string> *options(); + + /** + * Returns list of all options listed in conf file (even commented). + * Memory pointed by returned pointer must be freed! + */ + std::vector<std::string> *allOptions(); + + /** + * Returns list of parameters of option identified by option_name. + * Memory pointed by returned pointer must be freed! + */ + std::vector<std::vector<std::string> > *paramsOfOption(std::string option_name); + + + /** + * Assign to option with name option_name list of parameters params. + */ + void changeOption(std::string option_name, + std::vector<std::vector<std::string> > &params); +}; +#endif Added: trunk/squid/agents/src/squid_parser.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/src/squid_parser.cp… ============================================================================== --- trunk/squid/agents/src/squid_parser.cpp (added) +++ trunk/squid/agents/src/squid_parser.cpp Fri Oct 19 12:50:27 2007 @@ -0,0 +1,247 @@ +#include "squid_parser.h" +#include <string> +#include <vector> +#include <boost/regex.hpp> + +using std::string; +using std::istream; +using std::vector; + +// private: +void SquidParser::_readNextLine() +{ + std::getline(_in, _current_line); +} + +void SquidParser::_changeState(SquidParser::states_t new_state) +{ + _current_state = new_state; +} + +SquidParser::regexps_t SquidParser::_matchCurrentLine() +{ + if (boost::regex_search(_current_line, _matched, _regexps[R_BLANK_LINE])){ + return R_BLANK_LINE; + }else if (boost::regex_search(_current_line, _matched, _regexps[R_TAGGED_COMMENT])){ + return R_TAGGED_COMMENT; + }else if (boost::regex_search(_current_line, _matched, _regexps[R_COMMENT])){ + return R_COMMENT; + }else if (boost::regex_search(_current_line, _matched, _regexps[R_CONFIG_OPTION])){ + return R_CONFIG_OPTION; + } + + return R_NONE; +} + +void SquidParser::_addCurrentLineToComments() +{ + _comments.push_back(_current_line); + _readNextLine(); +} + +void SquidParser::_setCommentsAsTagged(boost::smatch matched_tag) +{ + DBG("_setCommentsAsTagged() - matched_tag: " << matched_tag[1]); + _comments_tag = matched_tag[1]; +} + +void SquidParser::_setCommentsAsTaggedFromConfigOption(boost::smatch matched_tag) +{ + DBG("_setCommentsAsTaggedFromConfigOption() - matched_tag: " << matched_tag[1]); + + string str = matched_tag[1]; + string::size_type lastPos = str.find_first_not_of(" \t", 0); + string::size_type pos = str.find_first_of(" \t", lastPos); + _comments_tag = str.substr(lastPos, pos - lastPos); +} + + +void SquidParser::_saveComments() +{ +#ifndef NDEBUG + DBG(""); + if (_comments_tag.size() > 0){ + DBG("===== DUMP TAGGED COMMENTS (tag: " << _comments_tag << ") ====="); + }else{ + DBG("===== DUMP COMMENTS ====="); + } + int size = _comments.size(); + for (int i=0; i < size; i++){ + DBG(_comments[i]); + } + DBG("===== DUMP COMMENTS END ====="); + DBG(""); +#endif + + file.addComments(_comments_tag, _comments); + + _comments.clear(); + _comments_tag.clear(); +} + + +void SquidParser::_saveConfigOption(boost::smatch matched_option) +{ + DBG("_saveConfigOption: " << matched_option[1]); + DBG("_saveConfigOption: matched_option.size(): " << matched_option.size()); + DBG("_saveConfigOption matched_option[2]: " << matched_option[2]); + + string str = matched_option[1]; + string option_name; + vector<string> options; + + string::size_type lastPos = str.find_first_not_of(" \t", 0); + string::size_type pos = str.find_first_of(" \t", lastPos); + + option_name = str.substr(lastPos, pos - lastPos); + + lastPos = str.find_first_not_of(" \t", pos); + pos = str.find_first_of(" \t", lastPos); + while (string::npos != pos || string::npos != lastPos) + { + options.push_back(str.substr(lastPos, pos - lastPos)); + + lastPos = str.find_first_not_of(" \t", pos); + pos = str.find_first_of(" \t", lastPos); + } + + file.addConfigOption(option_name, options); + + if (matched_option.size() > 2 && ((string)matched_option[2]).size() > 0){ + vector<string> comments; + comments.push_back(matched_option[2]); + file.addComments(option_name, comments); + } +} + + + +void SquidParser::_noinfo() +{ + DBG("Entering _noinfo()"); + + switch (_matchCurrentLine()){ + case R_COMMENT: + _changeState(S_COMMENT); + break; + case R_TAGGED_COMMENT: + _setCommentsAsTagged(_matched); + _changeState(S_TAGGED_COMMENT); + break; + case R_CONFIG_OPTION: + _changeState(S_CONFIG); + break; + case R_NONE: + _changeState(S_ERROR); + break; + case R_BLANK_LINE: + // skip blank lines + DBG("skipping blank line"); + _readNextLine(); + break; + } +} + +void SquidParser::_config() +{ + DBG("Entering _config()"); + + _saveConfigOption(_matched); + _readNextLine(); + _changeState(S_NOINFO); +} + +void SquidParser::_taggedComment() +{ + DBG("Entering _taggedComment()"); + + _addCurrentLineToComments(); + + switch (_matchCurrentLine()){ + case R_COMMENT: + case R_TAGGED_COMMENT: + break; + default: + _saveComments(); + _changeState(S_NOINFO); + break; + } +} + +void SquidParser::_comment() +{ + DBG("Entering _comment()"); + + _addCurrentLineToComments(); + + switch (_matchCurrentLine()){ + case R_COMMENT: + break; + case R_TAGGED_COMMENT: + _setCommentsAsTagged(_matched); + _changeState(S_TAGGED_COMMENT); + break; + case R_CONFIG_OPTION: + _setCommentsAsTaggedFromConfigOption(_matched); + _saveComments(); + _changeState(S_CONFIG); + break; + default: + _saveComments(); + _changeState(S_NOINFO); + break; + } +} + +void SquidParser::_error() +{ + DBG("Entering _error()"); + DBG("Some error occured: skipping current line (" << _current_line << ")"); + _readNextLine(); // ignore this line + _changeState(S_NOINFO); +} + + + + +// public: +SquidParser::SquidParser(std::string filename) : + _current_state(S_NOINFO), file(filename) +{ + _initRegexps(); + _in.open(filename.c_str()); + if (!_in){ + DBG("Can't open file \"" << filename << "\""); + } +} + + +void SquidParser::parse() +{ + DBG("start()"); + + _readNextLine(); + + while (_current_state != S_END && !_in.eof() && !_in.fail()){ + switch (_current_state){ + case S_NOINFO: + _noinfo(); + break; + case S_CONFIG: + _config(); + break; + case S_TAGGED_COMMENT: + _taggedComment(); + break; + case S_COMMENT: + _comment(); + break; + case S_ERROR: + _error(); + break; + case S_END: + return; + } + } +} + Added: trunk/squid/agents/src/squid_parser.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/src/squid_parser.h?… ============================================================================== --- trunk/squid/agents/src/squid_parser.h (added) +++ trunk/squid/agents/src/squid_parser.h Fri Oct 19 12:50:27 2007 @@ -0,0 +1,122 @@ +#ifndef _SQUID_PARSER_H_ +#define _SQUID_PARSER_H_ + +#include <fstream> +#include <iostream> +#include <string> +#include <vector> +#include <boost/regex.hpp> + +#include "squid_file.h" +#include "debug.h" + + +class SquidParser{ + private: + /** + * Enumeration of states used by automat. + */ + enum states_t { + S_NOINFO, + S_CONFIG, + S_TAGGED_COMMENT, + S_COMMENT, + S_ERROR, + S_END + }; + + /** + * Identificators of regexps. + */ + typedef enum regexps_t { + R_COMMENT, + R_TAGGED_COMMENT, + R_CONFIG_OPTION, + R_BLANK_LINE, + R_NONE + }; + + /** + * Input stream. + */ + std::ifstream _in; + + /** + * Current line read from _in. + */ + std::string _current_line; + + /** + * List of comment lines read from _in. + */ + std::vector<std::string> _comments; + + /** + * Tag of read comments. + */ + std::string _comments_tag; + + /** + * Matched strings from regexps. + */ + boost::smatch _matched; + + /** + * List of regexps (see regexps_t). + */ + boost::regex _regexps[R_NONE + 1]; + + /** + * Current state of automat. + */ + states_t _current_state; + + void _readNextLine(); + void _changeState(states_t); + + /** + * Match current line against _regexps and return identifier defined + * by regexps_t. + */ + regexps_t _matchCurrentLine(); + + void _addCurrentLineToComments(); + + /** + * Set tag to current read comments. + */ + void _setCommentsAsTagged(boost::smatch matched_tag); + void _setCommentsAsTaggedFromConfigOption(boost::smatch matched_tag); + + void _saveComments(); + void _saveConfigOption(boost::smatch matched_option); + + /** + * Initialize regexps. + */ + void _initRegexps() + { + _regexps[R_COMMENT] = "^#"; + _regexps[R_TAGGED_COMMENT] = "^#.*TAG:[ \\t]*([^ \\t\\n]+)"; + _regexps[R_CONFIG_OPTION] = "^[ \\t]*([^# \\t][^#]*[^# \\t])[ \\t]*(#.*){0,1}$"; + _regexps[R_BLANK_LINE] = "^[ \\t]*$"; + } + + + void _noinfo(); + void _config(); + void _taggedComment(); + void _comment(); + void _error(); + public: + SquidFile file; + + SquidParser(std::string filename); + ~SquidParser(){} + + /** + * Start parsing of _in. + */ + void parse(); +}; +#endif Modified: trunk/squid/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/configure.in.in?rev=41482&… ============================================================================== --- trunk/squid/configure.in.in (original) +++ trunk/squid/configure.in.in Fri Oct 19 12:50:27 2007 @@ -2,10 +2,16 @@ ## Initialize @YAST2-INIT-COMMON@ +@YAST2-INIT-PROGRAM@ @YAST2-INIT-YCP@ +#PKG_CHECK_MODULES([Y2UTIL], [liby2util]) +# AC_SUBST(Y2UTIL_CFLAGS) +# AC_SUBST(Y2UTIL_LIBS) + ## some common checks @YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-PROGRAM@ @YAST2-CHECKS-YCP@ ## and generate the output... Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=41482&r1… ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Fri Oct 19 12:50:27 2007 @@ -788,37 +788,33 @@ { boolean ok = true; list tmp = []; - list tmp2 = []; map <string,any> tmp_http_port = $[]; http_ports = []; - foreach (string value, (list<string>)SCR::Read(add(squid_path,"http_port")), + foreach (list<string> value, (list<list<string> >)SCR::Read(add(squid_path,"http_port")), { tmp_http_port = $[]; tmp = []; - tmp2 = []; - - tmp = split(value," \t"); //can parse only 'http_port hostname:port [transparent]' - if (size(tmp) < 1 || size(tmp) > 2){ + if (size(value) < 1 || size(value) > 2){ ok = false; return false; } // hostname and port - tmp2 = split(tmp[0]:"",":"); - y2debug("readHttpPorts - tmp2: %1",tmp2); - if (size(tmp2) == 1){ + tmp = split(value[0]:"",":"); + y2debug("readHttpPorts - tmp: %1",tmp); + if (size(tmp) == 1){ tmp_http_port["host"] = ""; - tmp_http_port["port"] = tmp2[0]:""; + tmp_http_port["port"] = tmp[0]:""; }else{ - tmp_http_port["host"] = (string)tmp2[0]:""; - tmp_http_port["port"] = tmp2[1]:""; + tmp_http_port["host"] = tmp[0]:""; + tmp_http_port["port"] = tmp[1]:""; } //transparent option - if (size(tmp) == 2 && tmp[1]:"" == "transparent") + if (size(value) == 2 && value[1]:"" == "transparent") tmp_http_port["transparent"] = true; http_ports = add(http_ports, tmp_http_port); @@ -836,23 +832,20 @@ boolean readHttpAccesses() { boolean ok = true; - list tmp = []; map <string,any> tmp_http_access = $[]; http_accesses = []; - foreach (string value, (list<string>)SCR::Read( add(squid_path,"http_access")), + foreach (list<string> value, (list<list<string> >)SCR::Read( add(squid_path,"http_access")), { tmp_http_access = $[]; - tmp = split(value, " \t"); - - if (tmp[0]:"" != "allow" && tmp[0]:"" != "deny"){ + if (value[0]:"" != "allow" && value[0]:"" != "deny"){ ok = false; return false; } - tmp_http_access["allow"] = (tmp[0]:"" == "allow" ? true : false); - tmp_http_access["acl"] = remove(tmp, 0); + tmp_http_access["allow"] = (value[0]:"" == "allow" ? true : false); + tmp_http_access["acl"] = remove(value, 0); http_accesses = add(http_accesses, tmp_http_access); }); @@ -869,33 +862,30 @@ boolean readRefreshPatterns() { boolean ok = true; - list tmp = []; map <string,any> tmp_refresh_pattern = $[]; refresh_patterns = []; - foreach (string value, (list<string>)SCR::Read( add(squid_path, "refresh_pattern")), + foreach (list<string> value, (list<list<string> >)SCR::Read( add(squid_path, "refresh_pattern")), { tmp_refresh_pattern = $[]; - tmp = split(value, " \t"); - //case-insesitive - if (tmp[0]:"" == "-i"){ + if (value[0]:"" == "-i"){ tmp_refresh_pattern["case_sensitive"] = false; - tmp = remove(tmp, 0); + value = remove(value, 0); }else{ tmp_refresh_pattern["case_sensitive"] = true; } - if (size(tmp) < 4){ + if (size(value) < 4){ ok = false; return false; } - tmp_refresh_pattern["regexp"] = tmp[0]:""; - tmp_refresh_pattern["min"] = tmp[1]:""; - tmp_refresh_pattern["percent"] = deletechars(tmp[2]:"","%"); - tmp_refresh_pattern["max"] = tmp[3]:""; + tmp_refresh_pattern["regexp"] = value[0]:""; + tmp_refresh_pattern["min"] = value[1]:""; + tmp_refresh_pattern["percent"] = deletechars(value[2]:"","%"); + tmp_refresh_pattern["max"] = value[3]:""; refresh_patterns = add(refresh_patterns, tmp_refresh_pattern); }); @@ -912,7 +902,6 @@ boolean readACLs() { boolean ok = true; - list tmp = []; map <string, any> tmp_acl = $[]; //list of types which contains regular expression @@ -925,20 +914,18 @@ ]; acls = []; - foreach (string value, (list<string>)SCR::Read( add(squid_path, "acl")), + foreach (list<string> value, (list<list<string> >)SCR::Read( add(squid_path, "acl")), { tmp_acl = $[]; - tmp = split(value, " \t"); - - if (size(tmp) < 3){ + if (size(value) < 3){ ok = false; return false; } - tmp_acl["name"] = tmp[0]:""; - tmp_acl["type"] = tmp[1]:""; - tmp_acl["options"] = remove(remove(tmp,0),0); + tmp_acl["name"] = value[0]:""; + tmp_acl["type"] = value[1]:""; + tmp_acl["options"] = remove(remove(value,0),0); // Special settings: // concat list of regular expressions into one option @@ -981,8 +968,9 @@ settings = $[]; foreach (string key, list value, parameters, { - tmp = (list <string>)SCR::Read( add(squid_path, key)); - tmp = split(tmp[0]:"", " \t"); + tmp = (list<list<string> >)SCR::Read( add(squid_path, key)); + //tmp = split(tmp[0]:"", " \t"); + tmp = tmp[0]:[]; if (size(tmp) > 0){ settings[key] = tmp; @@ -1100,15 +1088,19 @@ boolean writeHttpPorts() { boolean ok = true; - list<string> scr = []; - string tmp = ""; + list<list<string> > scr = []; + list<string> tmp = []; foreach (map<string,any> value, http_ports, { - tmp = value["host"]:""; - if (size(value["host"]:"") > 0) tmp = tmp + ":"; - tmp = tmp + value["port"]:""; - if (value["transparent"]:false) tmp = tmp + " transparent"; + tmp = []; + + if (size(value["host"]:"") > 0){ + tmp[0] = value["host"]:"" + ":" + value["port"]:""; + }else{ + tmp[0] = value["port"]:""; + } + if (value["transparent"]:false) tmp[1] = "transparent"; scr = add(scr, tmp); }); @@ -1123,14 +1115,16 @@ boolean writeACLs() { boolean ok = true; - list<string> scr = []; - string tmp = ""; + list<list<string> > scr = []; + list<string> tmp = []; foreach (map<string, any> value, acls, { - tmp = value["name"]:""; - tmp = tmp + " " + value["type"]:""; - tmp = tmp + " " + mergestring(value["options"]:[], " "); + tmp = []; + + tmp[0] = value["name"]:""; + tmp[1] = value["type"]:""; + tmp = (list<string>)merge(tmp, value["options"]:[]); scr = add(scr, tmp); }); @@ -1145,17 +1139,19 @@ boolean writeHttpAccesses() { boolean ok = true; - list<string> scr = []; - string tmp = ""; + list<list<string> > scr = []; + list<string> tmp = []; foreach (map<string,any> value, http_accesses, { + tmp = []; + if (value["allow"]:true){ - tmp = "allow"; + tmp[0] = "allow"; }else{ - tmp = "deny"; + tmp[0] = "deny"; } - tmp = tmp + " " + mergestring(value["acl"]:[], " "); + tmp = (list<string>)merge(tmp, (list<string>)value["acl"]:[]); scr = add(scr, tmp); }); @@ -1170,17 +1166,18 @@ boolean writeRefreshPatterns() { boolean ok = true; - list<string> scr = []; - string tmp = ""; + list<list<string> > scr = []; + list<string> tmp = []; foreach (map<string,any> value, refresh_patterns, { - tmp = ""; - if (!value["case_sensitive"]:false) tmp = "-i "; - tmp = tmp + value["regexp"]:""; - tmp = tmp + " " + value["min"]:""; - tmp = tmp + " " + value["percent"]:""; - tmp = tmp + " " + value["max"]:""; + tmp = []; + + if (!value["case_sensitive"]:false) tmp[0] = "-i "; + tmp = add(tmp, value["regexp"]:""); + tmp = add(tmp, value["min"]:""); + tmp = add(tmp, value["percent"]:""); + tmp = add(tmp, value["max"]:""); scr = add(scr, tmp); }); @@ -1195,15 +1192,13 @@ boolean writeRestSetting() { boolean ok = true; - string tmp = ""; list<string> setting = nil; foreach (string key, list value, parameters, { - tmp = mergestring(settings[key]:[], " "); - if (size(tmp) > 0){ - y2debug("Squid::Write - %1: %2", key, tmp); - if (!SCR::Write(add(squid_path, key), [tmp])){ + if (size(value) > 0){ + y2debug("Squid::Write - %1: %2", key, value); + if (!SCR::Write(add(squid_path, key), [value])){ y2error("Squid::Write - cannot write %1 setting", key); ok = false; } Modified: trunk/squid/yast2-squid.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/yast2-squid.spec.in?rev=41… ============================================================================== --- trunk/squid/yast2-squid.spec.in (original) +++ trunk/squid/yast2-squid.spec.in Fri Oct 19 12:50:27 2007 @@ -2,7 +2,7 @@ @HEADER@ Requires: yast2 filesystem -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-core-devel boost-devel BuildArchitectures: noarch -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41481 - /tags/stable-2_16_0/firstboot/
by jsuchome＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: jsuchome Date: Fri Oct 19 12:34:42 2007 New Revision: 41481 URL: http://svn.opensuse.org/viewcvs/yast?rev=41481&view=rev Log: Created tag stable-2_16_0 for firstboot Added: tags/stable-2_16_0/firstboot/ - copied from r41480, trunk/firstboot/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41480 - in /trunk/firstboot: ./ package/ scripts/ scripts/Firstboot-Stage/ src/ src/data/
by jsuchome＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: jsuchome Date: Fri Oct 19 12:34:35 2007 New Revision: 41480 URL: http://svn.opensuse.org/viewcvs/yast?rev=41480&view=rev Log: changes from SLE10SP1: - added support for keyboard and restaring network (#F302520) - added one more client for showing the license + new value FIRSTBOOT_NOVELL_LICENSE_DIR to /etc/sysconfig/firstboot (F302865) - restart kbd after yast is finished (#303808) - unset LC_ALL before starting firstboot stage (#252780) - retranslate buttons after language module (#252780) - 2.16.0 Added: trunk/firstboot/src/firstboot_keyboard.ycp (with props) trunk/firstboot/src/firstboot_license_novell.ycp (with props) trunk/firstboot/src/firstboot_network_write.ycp (with props) Modified: trunk/firstboot/VERSION trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup trunk/firstboot/scripts/firstboot trunk/firstboot/src/Makefile.am trunk/firstboot/src/data/sysconfig.firstboot trunk/firstboot/src/firstboot_language.ycp Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=41480&r1=4… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Fri Oct 19 12:34:35 2007 @@ -1 +1 @@ -2.15.1 +2.16.0 Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Fri Oct 19 12:34:35 2007 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Fri Oct 19 12:02:36 CEST 2007 - jsuchome(a)suse.cz + +- added support for keyboard and restaring network (#F302520) +- added one more client for showing the license + new value + FIRSTBOOT_NOVELL_LICENSE_DIR to /etc/sysconfig/firstboot (F302865) +- restart kbd after yast is finished (#303808) +- unset LC_ALL before starting firstboot stage (#252780) +- retranslate buttons after language module (#252780) +- 2.16.0 + +------------------------------------------------------------------- Wed Feb 28 11:49:25 CET 2007 - lslezak(a)suse.cz - Halt the system (configurable in LICENSE_REFUSAL_ACTION) if the Modified: trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/Firstboot-Stag… ============================================================================== --- trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup (original) +++ trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup Fri Oct 19 12:34:35 2007 @@ -42,4 +42,9 @@ rm -f $IFCFG_USB fi +if [ -e "/var/lib/YaST2/firstboot_kbd_restart" ] ; then + /etc/init.d/kbd restart + rm /var/lib/YaST2/firstboot_kbd_restart +fi + stop_unicode Modified: trunk/firstboot/scripts/firstboot URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/firstboot?rev=… ============================================================================== --- trunk/firstboot/scripts/firstboot (original) +++ trunk/firstboot/scripts/firstboot Fri Oct 19 12:34:35 2007 @@ -50,6 +50,8 @@ case "$1" in start) echo -n "Configuring System for the first time.. " + # LC_ALL is set to POSIX, so unset it so YaST2.Firstboot can correctly set the language + unset LC_ALL ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. /usr/lib/YaST2/startup/YaST2.Firstboot 2>/dev/null Modified: trunk/firstboot/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/Makefile.am?rev=41… ============================================================================== --- trunk/firstboot/src/Makefile.am (original) +++ trunk/firstboot/src/Makefile.am Fri Oct 19 12:34:35 2007 @@ -11,7 +11,10 @@ firstboot_license.ycp \ firstboot_welcome.ycp \ firstboot_ssh.ycp \ - firstboot.ycp + firstboot_keyboard.ycp \ + firstboot.ycp \ + firstboot_license_novell.ycp \ + firstboot_network_write.ycp ynclude_DATA = \ routines.ycp Modified: trunk/firstboot/src/data/sysconfig.firstboot URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/data/sysconfig.fir… ============================================================================== --- trunk/firstboot/src/data/sysconfig.firstboot (original) +++ trunk/firstboot/src/data/sysconfig.firstboot Fri Oct 19 12:34:35 2007 @@ -24,11 +24,18 @@ ## Default: "" # # Directory from which 'license.txt' and 'license_<locale>.txt' are read +# This are vendor-specific license texts FIRSTBOOT_LICENSE_DIR="" ## Type: string ## Default: "" # +# Directory from which 'license.txt' and 'license_<locale>.txt' are read +FIRSTBOOT_NOVELL_LICENSE_DIR="" + +## Type: string +## Default: "" +# # finish text file FIRSTBOOT_FINISH_FILE="" Added: trunk/firstboot/src/firstboot_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_keyboard… ============================================================================== --- trunk/firstboot/src/firstboot_keyboard.ycp (added) +++ trunk/firstboot/src/firstboot_keyboard.ycp Fri Oct 19 12:34:35 2007 @@ -0,0 +1,34 @@ +/** + * File : firstboot_keyboard.ycp + * Author : Jiri Suchomel <jsuchome(a)suse.cz> + * Purpose : Firstboot configuratiuon of keyboard + * + * $Id$ + */ +{ + textdomain "country"; + + import "Arch"; + import "Directory"; + import "Keyboard"; + import "Firstboot"; + + include "keyboard/dialogs.ycp"; + + any ret = `auto; + if (Arch::s390 ()) + return ret; + + Keyboard::Read (); + + ret = KeyboardDialog ($[]); + + if (ret == `next) + { + Keyboard::Save (false); + // kbd must be restarted after YaST finishes (#303808) + SCR::Execute (.target.bash, sformat ("touch %1/firstboot_kbd_restart", Directory::vardir)); + } + + return ret; +} Modified: trunk/firstboot/src/firstboot_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_language… ============================================================================== --- trunk/firstboot/src/firstboot_language.ycp (original) +++ trunk/firstboot/src/firstboot_language.ycp Fri Oct 19 12:34:35 2007 @@ -18,15 +18,16 @@ { textdomain "firstboot"; + import "Console"; import "Language"; import "Wizard"; import "Firstboot"; import "Popup"; - import "Label"; import "Encoding"; import "Mode"; import "GetInstArgs"; + import "ProductControl"; // Memozize the current language. // @@ -39,7 +40,10 @@ while (result == `again) { Wizard::SetDesktopIcon("language"); - result = WFM::CallFunction ("inst_language", [ GetInstArgs::argmap() ] ); + map args = GetInstArgs::argmap(); + args["first_run"] = "yes"; + result = WFM::CallFunction ("inst_language", [ args ] ); + Wizard::RetranslateButtons (); } y2milestone ("result '%1'", result); @@ -50,7 +54,6 @@ // y2milestone( "`cancel or `back --> restoring: <%1>", language_on_entry ); - import "Console"; import "Installation"; boolean use_utf8 = true; // utf8 is default @@ -81,10 +84,19 @@ { Firstboot::language_changed = true; Language::Save(); + Console::Save (); y2milestone( "Language changed --> saving" ); - - // popup text - Popup::Message( _("Your language setting has been changed. + boolean firstboot_keyboard = false; + foreach (map mod, ProductControl::getModules( "firstboot", Mode::mode (), `enabled), { + if (mod["name"]:"" == "firstboot_keyboard" && mod["enabled"]:false) + { + y2milestone ("keyboard will be configured -> no warning"); + firstboot_keyboard = true; + } + }); + if (!firstboot_keyboard) + // popup text + Popup::Message( _("Your language setting has been changed. If necessary, you may want to adapt your keyboard settings to the new language. This is possible either in the YaST2 Control Center or by Added: trunk/firstboot/src/firstboot_license_novell.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_license_… ============================================================================== --- trunk/firstboot/src/firstboot_license_novell.ycp (added) +++ trunk/firstboot/src/firstboot_license_novell.ycp Fri Oct 19 12:34:35 2007 @@ -0,0 +1,35 @@ +/* + * Module : firstboot_license_novell.ycp + * Authors: Ladislav Slezak <lslezak(a)suse.cz>, Jiri Suchomel <jsuchome(a)suse.cz> + * Purpose: Display Novell license at the start of firstboot + * + * $Id$ + */ + +{ + textdomain "firstboot"; + + import "Misc"; + import "GetInstArgs"; + + + any result = nil; + + map args = GetInstArgs::argmap(); + args["directory"] = Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, ""); + args["action"] = Misc::SysconfigRead(.sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort"); + + y2milestone("inst_license options: %1", args); + + result = WFM::CallFunction( "inst_license", [ args ] ); + + if (result == `halt) + { + UI::CloseDialog(); + y2milestone("Halting the system..."); + SCR::Execute(.target.bash, "/sbin/halt"); + } + + return result; + +} Added: trunk/firstboot/src/firstboot_network_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_network_… ============================================================================== --- trunk/firstboot/src/firstboot_network_write.ycp (added) +++ trunk/firstboot/src/firstboot_network_write.ycp Fri Oct 19 12:34:35 2007 @@ -0,0 +1,16 @@ +/** + * File : firstboot_network_write.ycp + * Author : Jiri Suchomel <jsuchome(a)suse.cz> + * Purpose : Save network configuration + * (usable when network proposal was not run) + * $Id$ + */ +{ + // currently only restart the service, may be enhanced later + + import "Service"; + + Service::Restart ("network"); + + return `auto; +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41479 - /tags/stable-2_16_0/kerberos-client/
by jsuchome＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: jsuchome Date: Fri Oct 19 12:07:35 2007 New Revision: 41479 URL: http://svn.opensuse.org/viewcvs/yast?rev=41479&view=rev Log: Created tag stable-2_16_0 for kerberos-client Added: tags/stable-2_16_0/kerberos-client/ - copied from r41478, trunk/kerberos-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41478 - in /trunk/kerberos-client: VERSION package/yast2-kerberos-client.changes src/dialogs.ycp
by jsuchome＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: jsuchome Date: Fri Oct 19 12:07:15 2007 New Revision: 41478 URL: http://svn.opensuse.org/viewcvs/yast?rev=41478&view=rev Log: - Use Kerberos checked by default during installation (#330054) - 2.16.0 Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/dialogs.ycp Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=4147… ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Fri Oct 19 12:07:15 2007 @@ -1 +1 @@ -2.15.7 +2.16.0 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-ke… ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Fri Oct 19 12:07:15 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 19 11:28:26 CEST 2007 - jsuchome(a)suse.cz + +- Use Kerberos checked by default during installation (#330054) +- 2.16.0 + +------------------------------------------------------------------- Tue Jul 31 12:25:15 CEST 2007 - jsuchome(a)suse.cz - Smart Card Integration (F302132): Modified: trunk/kerberos-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/dialogs.ycp?… ============================================================================== --- trunk/kerberos-client/src/dialogs.ycp (original) +++ trunk/kerberos-client/src/dialogs.ycp Fri Oct 19 12:07:15 2007 @@ -106,10 +106,13 @@ // help text 5/5 _("<p>To configure more settings, click <b>Advanced Settings</b>.</p>"); + // during installation, star ldap is default value + boolean installation = + Stage::cont () && !contains (WFM::Args (), "from_users"); string default_realm = Kerberos::default_realm; string kdc = Kerberos::kdc; string default_domain = Kerberos::default_domain; - boolean use_pam_krb = Kerberos::use_pam_krb; + boolean use_pam_krb = Kerberos::use_pam_krb || installation; term con = `HBox (`HSpacing (3), `VBox ( `VSpacing (0.5), @@ -152,6 +155,11 @@ foreach (symbol widget, [`realm, `domain, `kdc, `advanced], ``{ UI::ChangeWidget (`id (widget), `Enabled, use_pam_krb); }); + // during installation, only enabling makes sence + if (installation) + { + UI::ChangeWidget (`id (`pamno), `Enabled, false); + } symbol result = nil; do -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41477 - /tags/stable-2_16_0/nis-client/
by jsuchome＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: jsuchome Date: Fri Oct 19 11:18:43 2007 New Revision: 41477 URL: http://svn.opensuse.org/viewcvs/yast?rev=41477&view=rev Log: Created tag stable-2_16_0 for nis-client Added: tags/stable-2_16_0/nis-client/ - copied from r41476, trunk/nis-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41476 - in /trunk/nis-client: VERSION package/yast2-nis-client.changes src/Nis.ycp testsuite/tests/readwrite.out
by jsuchome＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: jsuchome Date: Fri Oct 19 11:18:19 2007 New Revision: 41476 URL: http://svn.opensuse.org/viewcvs/yast?rev=41476&view=rev Log: - clear nscd cache instead of restarting nscd (#333305) - 2.16.0 Modified: trunk/nis-client/VERSION trunk/nis-client/package/yast2-nis-client.changes trunk/nis-client/src/Nis.ycp trunk/nis-client/testsuite/tests/readwrite.out Modified: trunk/nis-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/VERSION?rev=41476&r1=… ============================================================================== --- trunk/nis-client/VERSION (original) +++ trunk/nis-client/VERSION Fri Oct 19 11:18:19 2007 @@ -1 +1 @@ -2.15.3 +2.16.0 Modified: trunk/nis-client/package/yast2-nis-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/package/yast2-nis-cli… ============================================================================== --- trunk/nis-client/package/yast2-nis-client.changes (original) +++ trunk/nis-client/package/yast2-nis-client.changes Fri Oct 19 11:18:19 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 19 11:00:23 CEST 2007 - jsuchome(a)suse.cz + +- clear nscd cache instead of restarting nscd (#333305) +- 2.16.0 + +------------------------------------------------------------------- Mon Aug 27 16:29:32 CEST 2007 - jsuchome(a)suse.cz - install nfs-client together with autofs (#304309) Modified: trunk/nis-client/src/Nis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/src/Nis.ycp?rev=41476… ============================================================================== --- trunk/nis-client/src/Nis.ycp (original) +++ trunk/nis-client/src/Nis.ycp Fri Oct 19 11:18:19 2007 @@ -1034,9 +1034,11 @@ SCR::Execute (.target.bash, "/sbin/SuSEconfig --module kdm3"); } - // if the name service cache daemon is running, restart it - if (Service::Status("nscd") == 0) { - Service::Restart("nscd"); + // remove nscd cache + if (Package::Installed ("nscd") && modified) + { + SCR::Execute (.target.bash, "/usr/sbin/nscd -i passwd"); + SCR::Execute (.target.bash, "/usr/sbin/nscd -i group"); } if (_autofs_allowed && touched) Modified: trunk/nis-client/testsuite/tests/readwrite.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/testsuite/tests/readw… ============================================================================== --- trunk/nis-client/testsuite/tests/readwrite.out (original) +++ trunk/nis-client/testsuite/tests/readwrite.out Fri Oct 19 11:18:19 2007 @@ -93,10 +93,6 @@ Execute .target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0 Execute .target.bash_output "/etc/init.d/ypbind start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":"mydomain\n"] Execute .target.bash "/usr/bin/ypwhich >/dev/null" 0 -Read .init.scripts.exists "nscd" true -Execute .target.bash "/etc/init.d/nscd status" $["TERM":"raw"] 0 -Read .init.scripts.exists "nscd" true -Execute .target.bash "/etc/init.d/nscd restart" $["TERM":"raw"] 0 Read .init.scripts.exists "SuSEfirewall2_init" true Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true @@ -184,10 +180,6 @@ Execute .target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0 Execute .target.bash_output "/etc/init.d/ypbind start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":"mydomain\n"] Execute .target.bash "/usr/bin/ypwhich >/dev/null" 0 -Read .init.scripts.exists "nscd" true -Execute .target.bash "/etc/init.d/nscd status" $["TERM":"raw"] 0 -Read .init.scripts.exists "nscd" true -Execute .target.bash "/etc/init.d/nscd restart" $["TERM":"raw"] 0 Read .init.scripts.exists "autofs" true Execute .target.bash "/etc/init.d/autofs stop" $["TERM":"raw"] 0 Read .init.scripts.exists "autofs" true -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41475 - /tags/stable-2_16_0/pam/
by jsuchome＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: jsuchome Date: Fri Oct 19 11:14:02 2007 New Revision: 41475 URL: http://svn.opensuse.org/viewcvs/yast?rev=41475&view=rev Log: Created tag stable-2_16_0 for pam Added: tags/stable-2_16_0/pam/ - copied from r41474, trunk/pam/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41474 - in /trunk/pam: VERSION agent-passwd/ag_passwd package/yast2-pam.changes
by jsuchome＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: jsuchome Date: Fri Oct 19 11:13:53 2007 New Revision: 41474 URL: http://svn.opensuse.org/viewcvs/yast?rev=41474&view=rev Log: - check for empty lines in passwd/group/shadow (#333305) - 2.16.0 Modified: trunk/pam/VERSION trunk/pam/agent-passwd/ag_passwd trunk/pam/package/yast2-pam.changes Modified: trunk/pam/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/VERSION?rev=41474&r1=41473&r… ============================================================================== --- trunk/pam/VERSION (original) +++ trunk/pam/VERSION Fri Oct 19 11:13:53 2007 @@ -1 +1 @@ -2.14.0 +2.16.0 Modified: trunk/pam/agent-passwd/ag_passwd URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/agent-passwd/ag_passwd?rev=4… ============================================================================== --- trunk/pam/agent-passwd/ag_passwd (original) +++ trunk/pam/agent-passwd/ag_passwd Fri Oct 19 11:13:53 2007 @@ -83,6 +83,11 @@ { chomp $shadow_entry; + if ($shadow_entry eq "") { + y2warning ("empty line in shadow file..."); + next; + } + my ($uname,$pass,$last_change,$min, $max, $warn, $inact, $expire, $flag) = split(/:/,$shadow_entry); my $first = substr ($uname, 0, 1); @@ -94,7 +99,7 @@ } elsif ($first ne "+" && $first ne "-") { - if ($uname eq "") { + if (!defined $uname || $uname eq "") { y2error ("strange line in shadow file: '$shadow_entry'"); $errno = 9; return 9; @@ -148,6 +153,11 @@ foreach my $group (<GROUP>) { chomp $group; + + if ($group eq "") { + y2warning ("empty line in group file ..."); + next; + } my ($groupname, $pass, $gid, $users) = split (/:/,$group); my $first = substr ($groupname, 0, 1); @@ -250,6 +260,11 @@ foreach my $user (<PASSWD>) { chomp $user; + + if ($user eq "") { + y2warning ("empty line in passwd file..."); + next; + } my ($username, $password, $uid, $gid, $full, $home, $shell) = split(/:/,$user); my $first = substr ($username, 0, 1); Modified: trunk/pam/package/yast2-pam.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/package/yast2-pam.changes?re… ============================================================================== --- trunk/pam/package/yast2-pam.changes (original) +++ trunk/pam/package/yast2-pam.changes Fri Oct 19 11:13:53 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 19 11:07:04 CEST 2007 - jsuchome(a)suse.cz + +- check for empty lines in passwd/group/shadow (#333305) +- 2.16.0 + +------------------------------------------------------------------- Thu Aug 24 14:52:31 CEST 2006 - jsuchome(a)suse.cz - adapted for pam-config usage (F300956) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41473 - /tags/stable-2_16_0/samba-client/
by jsuchome＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: jsuchome Date: Fri Oct 19 11:13:24 2007 New Revision: 41473 URL: http://svn.opensuse.org/viewcvs/yast?rev=41473&view=rev Log: Created tag stable-2_16_0 for samba-client Added: tags/stable-2_16_0/samba-client/ - copied from r41472, trunk/samba-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0